Commits

Jing Wang Thinkpad  committed 09f321c

archieve before update the SADIT/Configure Module

  • Participants
  • Parent commits 089cdb3

Comments (0)

Files changed (12)

File core/ns3/Experiment/__init__.py

 from __future__ import print_function
-print('run here 11')
+# print('run here 11')
 from Experiment import ImalseExperiment
-print('run here 12')
+# print('run here 12')
 from ImalsePureSimExperiment import ImalsePureSimExperiment
-print('run here 13')
+# print('run here 13')
 
 try:
     from ImalseNetnsExperiment import ImalseNetnsExperiment

File core/ns3/__init__.py

     filename, linenum, funcname = inspect.getframeinfo(inspect.currentframe())[:3]
     print('[%s %s %s] Netns mode not supported'%(filename, linenum, funcname))
 
-print('run here 1')
+# print('run here 1')
 from Experiment import ImalsePureSimExperiment
-print('run here 2')
+# print('run here 2')
 from Node import ImalseNetnsSimNode
-print('run here 3')
+# print('run here 3')
 from Topology import TopologyNet
-print('run here 4')
+# print('run here 4')

File experiments/ManualTopoBTExperiment.py

         parser.set_defaults(back_traf="net_config/back_traf.py",
                 )
         parser.add_option('--back_traf', dest="back_traf",
-                help='parameters for back ground traffic',
+                help='confgiuration files for back ground traffic',
                 )
 
     def load_back_traf(self, **kwargs):

File gui/imalse_config/net_settings.py

 ipv4_net_addr_base = '10.7.0.1/24'
 link_attr_default = ['2ms','5Mbps']
 link_to_ip_map = {
-	(1, 0):['10.0.0.10/24', '10.0.0.1/24'],
-	(0, 2):['10.0.1.1/24', '10.0.1.20/24'],
-	(0, 3):['10.0.2.1/24', '10.0.2.20/24'],
-	(0, 4):['10.0.3.1/24', '10.0.3.20/24'],
-	(0, 5):['10.0.4.1/24', '10.0.4.20/24'],
-	(6, 0):['10.0.5.20/24', '10.0.5.1/24'],
-	(2, 3):['10.0.6.20/24', '10.0.6.21/24'],
+	(0, 2):['', '10.20.30.1/24'],
+	(0, 3):['', '10.20.30.2/24'],
+	(0, 4):['', '10.20.30.3/24'],
+	(0, 5):['', '10.20.30.4/24'],
+	(1, 0):['10.200.1.1', ''],
+	(6, 0):['10.1.1.1/24', '10.20.30.9/24'],
+	(7, 6):['1.1.1.1/24', '60.70.80.1/24'],
+	(8, 6):['2.3.5.6/24', '10.0.0.1/24'],
+	(6, 9):['10.0.1.1/24', '5.6.8.9/24'],
+	(12, 0):['10.20.30.8/24', ''],
+	(11, 0):['10.20.30.7/24', ''],
+	(10, 0):['10.20.30.6/24', ''],
+	(13, 0):['10.20.30.5/24', ''],
 }
 link_attr = {
-	(0, 5):['160 us', '10.00 Mbps'],
 }
-pcap_nodes = [ 1 ]
-pcap_links = [ (0,5) ]
-botmaster_id_set = [ 5 ]
-client_id_set = [ 2, 3, 4 ]
-server_id_set = [ 1 ]
-server_addr = [ "10.0.0.10/24" ]
+pcap_nodes = [  ]
+pcap_links = [  ]
+botmaster_id_set = [  ]
+client_id_set = [  ]
+server_id_set = [  ]
+server_addr = [  ]

File gui/imalse_config/topology.inet

-7 1
-0	323.0	205.0
-1	305.0	133.0
-2	182.0	248.0
-3	423.0	285.0
-4	520.0	245.0
-5	591.0	174.0
-6	146.0	193.0
-1	0	1
+14 1
+0	526.0	349.0
+2	330.0	538.0
+3	545.0	545.0
+4	724.0	537.0
+5	876.0	528.0
+1	709.0	262.0
+6	350.0	259.0
+7	176.0	128.0
+8	86.0	219.0
+9	290.0	65.0
+10	285.0	484.0
+11	261.0	433.0
+12	280.0	351.0
+13	433.0	561.0
 0	2	1
 0	3	1
 0	4	1
 0	5	1
+1	0	1
 6	0	1
-2	3	1
+7	6	1
+8	6	1
+6	9	1
+12	0	1
+11	0	1
+10	0	1
+13	0	1

File gui/prefs.conf

 # CORE 4.3 GUI preference file
-set g_mrulist "/home/wangjing/Downloads/ARO.imn ./sample.imn ./sample.imm /Users/wangjing/Dropbox/GSOC/code/imalse/gui/sample.imm"
+set g_mrulist "/home/wangjing/Apps/imalse/net_config/aro_demo/ARO.imn ./sample.imn /home/wangjing/Downloads/ARO.imn ./sample.imm"
 array set g_prefs {
 	default_conf_path	"./configs"
 	enable_rj45		"1"

File net_config/aro_demo/ARO.imn

+node n1 {
+    type router
+    model router
+    network-config {
+	hostname BCT_HQ
+	!
+	interface eth9
+	 mac address 00:00:00:00:00:00
+	!
+	interface eth8
+	!
+	interface eth7
+	!
+	interface eth6
+	!
+	interface eth5
+	 ipv6 address 2001:5::2/64
+	 ip address 10.20.30.9/24
+	!
+	interface eth0
+	!
+	interface eth4
+	!
+	interface eth3
+	!
+	interface eth2
+	!
+	interface eth1
+	!
+    }
+    canvas c1
+    iconcoords {526.0 349.0}
+    labelcoords {526.0 377.0}
+    interface-peer {eth1 n3}
+    interface-peer {eth2 n4}
+    interface-peer {eth3 n5}
+    interface-peer {eth4 n6}
+    interface-peer {eth0 n2}
+    interface-peer {eth5 n7}
+    interface-peer {eth6 n13}
+    interface-peer {eth7 n12}
+    interface-peer {eth8 n11}
+    interface-peer {eth9 n14}
+}
+
+node n3 {
+    type router
+    model PC
+    network-config {
+	hostname BCT1
+	!
+	interface eth0
+	 ipv6 address 2001:1::20/64
+	 ip address 10.20.30.1/24
+	!
+    }
+    canvas c1
+    iconcoords {330.0 538.0}
+    labelcoords {330.0 570.0}
+    interface-peer {eth0 n1}
+}
+
+node n4 {
+    type router
+    model PC
+    network-config {
+	hostname BCT2
+	!
+	interface eth0
+	 ipv6 address 2001:2::20/64
+	 ip address 10.20.30.2/24
+	!
+    }
+    canvas c1
+    iconcoords {545.0 545.0}
+    labelcoords {545.0 577.0}
+    interface-peer {eth0 n1}
+}
+
+node n5 {
+    type router
+    model PC
+    network-config {
+	hostname BCT3
+	!
+	interface eth0
+	 ipv6 address 2001:3::20/64
+	 ip address 10.20.30.3/24
+	!
+    }
+    canvas c1
+    iconcoords {724.0 537.0}
+    labelcoords {724.0 569.0}
+    interface-peer {eth0 n1}
+}
+
+node n6 {
+    type router
+    model PC
+    network-config {
+	hostname BCT4
+	!
+	interface eth0
+	 ipv6 address 2001:4::20/64
+	 ip address 10.20.30.4/24
+	!
+    }
+    canvas c1
+    iconcoords {876.0 528.0}
+    labelcoords {876.0 560.0}
+    interface-peer {eth0 n1}
+}
+
+node n2 {
+    type router
+    model host
+    network-config {
+	hostname BDE
+	!
+	interface eth0
+	 ipv6 address 2001:0::20/64
+	 ip address 10.200.1.1
+	!
+    }
+    canvas c1
+    iconcoords {709.0 262.0}
+    labelcoords {709.0 294.0}
+    interface-peer {eth0 n1}
+}
+
+node n7 {
+    type router
+    model router
+    network-config {
+	hostname STEP
+	!
+	interface eth3
+	 ip address 10.0.1.1/24
+	 ipv6 address 2001:8::1/64
+	!
+	interface eth2
+	 ip address 10.0.0.1/24
+	 ipv6 address 2001:7::1/64
+	!
+	interface eth1
+	 ipv6 address 2001:6::1/64
+	 ip address 60.70.80.1/24
+	!
+	interface eth0
+	 ipv6 address 2001:5::1/64
+	 ip address 10.1.1.1/24
+	!
+    }
+    canvas c1
+    iconcoords {350.0 259.0}
+    labelcoords {350.0 287.0}
+    interface-peer {eth0 n1}
+    interface-peer {eth1 n8}
+    interface-peer {eth2 n9}
+    interface-peer {eth3 n10}
+}
+
+node n8 {
+    type router
+    model host
+    network-config {
+	hostname Internet
+	!
+	interface eth0
+	 ipv6 address 2001:6::10/64
+	 ip address 1.1.1.1/24
+	!
+    }
+    canvas c1
+    iconcoords {176.0 128.0}
+    labelcoords {176.0 160.0}
+    interface-peer {eth0 n7}
+}
+
+node n9 {
+    type router
+    model PC
+    network-config {
+	hostname Internet 2
+	!
+	interface eth0
+	 ipv6 address 2001:7::20/64
+	 ip address 2.3.5.6/24
+	!
+    }
+    canvas c1
+    iconcoords {86.0 219.0}
+    labelcoords {86.0 251.0}
+    interface-peer {eth0 n7}
+}
+
+node n10 {
+    type router
+    model PC
+    network-config {
+	hostname Internet 3
+	!
+	interface eth0
+	 ipv6 address 2001:8::20/64
+	 ip address 5.6.8.9/24
+	!
+    }
+    canvas c1
+    iconcoords {290.0 65.0}
+    labelcoords {290.0 97.0}
+    interface-peer {eth0 n7}
+}
+
+node n11 {
+    type router
+    model PC
+    network-config {
+	hostname BCT6
+	!
+	interface eth0
+	 ipv6 address 2001:11::20/64
+	 ip address 10.20.30.6/24
+	!
+    }
+    canvas c1
+    iconcoords {285.0 484.0}
+    labelcoords {285.0 516.0}
+    interface-peer {eth0 n1}
+}
+
+node n12 {
+    type router
+    model PC
+    network-config {
+	hostname BCT7
+	!
+	interface eth0
+	 ipv6 address 2001:10::20/64
+	 ip address 10.20.30.7/24
+	!
+    }
+    canvas c1
+    iconcoords {261.0 433.0}
+    labelcoords {261.0 465.0}
+    interface-peer {eth0 n1}
+}
+
+node n13 {
+    type router
+    model PC
+    network-config {
+	hostname BCT8
+	!
+	interface eth0
+	 ipv6 address 2001:9::20/64
+	 ip address 10.20.30.8/24
+	!
+    }
+    canvas c1
+    iconcoords {280.0 351.0}
+    labelcoords {280.0 383.0}
+    interface-peer {eth0 n1}
+}
+
+node n14 {
+    type router
+    model PC
+    network-config {
+	hostname BCT5
+	!
+	interface eth0
+	 ipv6 address 2001:12::20/64
+	 ip address 10.20.30.5/24
+	!
+    }
+    canvas c1
+    iconcoords {433.0 561.0}
+    labelcoords {433.0 593.0}
+    interface-peer {eth0 n1}
+}
+
+link l2 {
+    nodes {n1 n3}
+    bandwidth 0
+}
+
+link l3 {
+    nodes {n1 n4}
+    bandwidth 0
+}
+
+link l4 {
+    nodes {n1 n5}
+    bandwidth 0
+}
+
+link l5 {
+    width 1
+    color Red
+    traceflag no
+    nodes {n1 n6}
+}
+
+link l1 {
+    nodes {n2 n1}
+    bandwidth 0
+}
+
+link l6 {
+    nodes {n7 n1}
+    bandwidth 0
+}
+
+link l7 {
+    nodes {n8 n7}
+    bandwidth 0
+}
+
+link l8 {
+    nodes {n9 n7}
+    bandwidth 0
+}
+
+link l9 {
+    nodes {n7 n10}
+    bandwidth 0
+}
+
+link l10 {
+    nodes {n13 n1}
+    bandwidth 0
+}
+
+link l11 {
+    nodes {n12 n1}
+    bandwidth 0
+}
+
+link l12 {
+    nodes {n11 n1}
+    bandwidth 0
+}
+
+link l13 {
+    nodes {n14 n1}
+    bandwidth 0
+}
+
+annotation a1 {
+    iconcoords {151 182 977 634}
+    type oval
+    label {Organization}
+    labelcolor black
+    fontfamily {Arial}
+    fontsize {12}
+    color #CFCFFF
+    width 0
+    border black
+    canvas c1
+}
+
+canvas c1 {
+    name {Canvas1}
+}
+
+option global {
+    interface_names no
+    ip_addresses yes
+    ipv6_addresses no
+    node_labels yes
+    link_labels yes
+    ipsec_configs yes
+    exec_errors yes
+    show_api no
+    background_images no
+    annotations yes
+    grid yes
+    traffic_start 0
+}
+
+option session {
+}
+

File net_config/aro_demo/net_settings.py

+ipv4_net_addr_base = '10.7.0.1/24'
+link_attr_default = ['2ms','5Mbps']
+link_to_ip_map = {
+	(0, 2):['', '10.20.30.1/24'],
+	(0, 3):['', '10.20.30.2/24'],
+	(0, 4):['', '10.20.30.3/24'],
+	(0, 5):['', '10.20.30.4/24'],
+	(1, 0):['10.200.1.1', ''],
+	(6, 0):['10.1.1.1/24', '10.20.30.9/24'],
+	(7, 6):['1.1.1.1/24', '60.70.80.1/24'],
+	(8, 6):['2.3.5.6/24', '10.0.0.1/24'],
+	(6, 9):['10.0.1.1/24', '5.6.8.9/24'],
+	(12, 0):['10.20.30.8/24', ''],
+	(11, 0):['10.20.30.7/24', ''],
+	(10, 0):['10.20.30.6/24', ''],
+	(13, 0):['10.20.30.5/24', ''],
+}
+link_attr = {
+}
+pcap_nodes = [  ]
+pcap_links = [  ]
+botmaster_id_set = [  ]
+client_id_set = [  ]
+server_id_set = [  ]
+server_addr = [  ]

File net_config/aro_demo/topology.inet

+14 1
+0	526.0	349.0
+2	330.0	538.0
+3	545.0	545.0
+4	724.0	537.0
+5	876.0	528.0
+1	709.0	262.0
+6	350.0	259.0
+7	176.0	128.0
+8	86.0	219.0
+9	290.0	65.0
+10	285.0	484.0
+11	261.0	433.0
+12	280.0	351.0
+13	433.0	561.0
+0	2	1
+0	3	1
+0	4	1
+0	5	1
+1	0	1
+6	0	1
+7	6	1
+8	6	1
+6	9	1
+12	0	1
+11	0	1
+10	0	1
+13	0	1

File share/bg_net_settings_tmp.py

 link_attr = {   (0, 1): ['0.01s', '10000000bps'],
     (0, 2): ['0.01s', '10000000bps'],
     (0, 3): ['0.01s', '10000000bps'],
+    (0, 4): ['0.01s', '10000000bps'],
     (0, 5): ['0.01s', '10000000bps'],
     (0, 6): ['0.01s', '10000000bps'],
-    (2, 7): ['0.01s', '10000000bps'],
-    (3, 4): ['0.01s', '10000000bps'],
-    (8, 1): ['0.01s', '10000000bps'],
-    (9, 0): ['0.01s', '10000000bps']}
-link_to_ip_map = {   (0, 1): ('10.0.7.4/24', '10.0.7.5/24'),
-    (0, 2): ('10.0.8.4/24', '10.0.8.5/24'),
-    (0, 3): ('10.0.9.4/24', '10.0.9.5/24'),
+    (6, 7): ['0.01s', '10000000bps'],
+    (8, 6): ['0.01s', '10000000bps'],
+    (9, 6): ['0.01s', '10000000bps'],
+    (10, 0): ['0.01s', '10000000bps'],
+    (11, 0): ['0.01s', '10000000bps'],
+    (12, 0): ['0.01s', '10000000bps'],
+    (13, 0): ['0.01s', '10000000bps']}
+link_to_ip_map = {   (0, 1): ('10.0.11.5/24', '10.0.11.4/24'),
+    (0, 2): ('10.0.7.4/24', '10.0.7.5/24'),
+    (0, 3): ('10.0.8.4/24', '10.0.8.5/24'),
+    (0, 4): ('10.0.9.4/24', '10.0.9.5/24'),
     (0, 5): ('10.0.10.4/24', '10.0.10.5/24'),
-    (0, 6): ('10.0.11.4/24', '10.0.11.5/24'),
-    (2, 7): ('10.0.14.4/24', '10.0.14.5/24'),
-    (3, 4): ('10.0.15.4/24', '10.0.15.5/24'),
-    (8, 1): ('10.0.13.5/24', '10.0.13.4/24'),
-    (9, 0): ('10.0.12.5/24', '10.0.12.4/24')}
+    (0, 6): ('10.0.12.5/24', '10.0.12.4/24'),
+    (6, 7): ('10.0.14.5/24', '10.0.14.4/24'),
+    (8, 6): ('10.0.15.4/24', '10.0.15.5/24'),
+    (9, 6): ('10.0.13.5/24', '10.0.13.4/24'),
+    (10, 0): ('10.0.16.4/24', '10.0.16.5/24'),
+    (11, 0): ('10.0.17.4/24', '10.0.17.5/24'),
+    (12, 0): ('10.0.18.4/24', '10.0.18.5/24'),
+    (13, 0): ('10.0.19.4/24', '10.0.19.5/24')}
 
-pcap_nodes = [0]
-pcap_links = [(0, 1)]
-botmaster_id_set = [1]
-client_id_set = [2, 3, 4]
-server_id_set = [0]
+pcap_nodes = []
+pcap_links = []
+botmaster_id_set = []
+client_id_set = []
+server_id_set = []
 server_addr = []

File share/bg_topology.inet

-10	9
+14	13
+12	0.000000	0.000000
+13	0.000000	0.000000
+10	0.000000	0.000000
+11	0.000000	0.000000
 8	0.000000	0.000000
 9	0.000000	0.000000
 0	0.000000	0.000000
 5	0.000000	0.000000
 6	0.000000	0.000000
 7	0.000000	0.000000
-8	1	1
-9	0	1
+12	0	1
+13	0	1
+10	0	1
+11	0	1
+8	6	1
+9	6	1
 0	1	1
 0	2	1
 0	3	1
+0	4	1
 0	5	1
 0	6	1
-2	7	1
-3	4	1
+6	7	1
 parser.add_argument('-e', '--experiment', default='TopoExperiment',
         help='specify the experiment. Avaliable experiments are [%s]'%(" |").join(exper_options)
         )
-
 parser.add_argument('--mode', default='sim',
         help="specify the mode, can be ['netns3' | 'sim'], default is 'sim'. "
         )