Cleanup
diff --git a/TestON/tests/scaleONOS7nodes/scale3nodesrate1 b/TestON/tests/scaleONOS7nodes/scale3nodesrate1
deleted file mode 100644
index 9caaa19..0000000
--- a/TestON/tests/scaleONOS7nodes/scale3nodesrate1
+++ /dev/null
@@ -1,176 +0,0 @@
-ONOS1
-46 0.0159911170741 0.00330570923568 0.00110803039902 0.441388322918
-ONOS2
-169 1.4232094196 0.294208121975 0.0986147055128 1.51983829287
-ONOS3
-171 0.0 0.0 0.0 1.55826946014
-
----------------------------------------------------------------------------------
-ONOS1
-1798 22.6349154776 5.65275867857 1.9589352278 12.3275451079
-ONOS2
-1798 20.8145837636 5.10869633674 1.76466018187 12.4714931153
-ONOS3
-1798 22.0791171081 5.47471756204 1.8948008043 12.6620550588
-
----------------------------------------------------------------------------------
-ONOS1
-3426 32.6111034518 9.70067081694 3.47552137643 19.2298566624
-ONOS2
-3426 34.2140340329 10.1493268369 3.63676115043 19.4125205852
-ONOS3
-3426 33.2868110325 9.74024939592 3.48023473974 19.6519137751
-
----------------------------------------------------------------------------------
-ONOS1
-5055 41.1154795596 14.3295561289 5.31573150012 24.0283473918
-ONOS2
-5055 40.2618482051 13.877993799 5.13339673365 24.228413302
-ONOS3
-5055 40.3643986592 14.0755662838 5.21932817392 24.4842903967
-
----------------------------------------------------------------------------------
-ONOS1
-6648 44.0476719882 17.5652363011 6.72454316035 27.4144919114
-ONOS2
-6648 42.837315358 17.4660161912 6.71183843666 27.6117430147
-ONOS3
-6660 44.6253917733 17.5746713259 6.71339463557 27.9185886652
-
----------------------------------------------------------------------------------
-ONOS1
-8223 45.5204851503 20.4781124794 8.08545718874 29.9446955545
-ONOS2
-8223 47.0478790956 20.9180018605 8.25491048977 30.134904835
-ONOS3
-8223 46.0539241762 20.9125541798 8.28383012594 30.3823258358
-
----------------------------------------------------------------------------------
-ONOS1
-9761 48.2472730422 23.9163379895 9.74938162547 31.8260874816
-ONOS2
-9761 47.8554206671 23.5746897161 9.5837979702 32.0069787799
-ONOS3
-9761 47.9086582813 23.7657314867 9.68161495588 32.2419983542
-
----------------------------------------------------------------------------------
-ONOS1
-11390 48.2977231982 26.23623474 11.0124446377 33.6205734759
-ONOS2
-11390 48.6817460585 26.4263736828 11.1034039314 33.7938746975
-ONOS3
-11390 48.9914985281 26.3026447756 11.0160590425 34.0180954514
-
----------------------------------------------------------------------------------
-ONOS1
-13019 49.5587788244 28.9609886715 12.535952061 35.1042945838
-ONOS2
-13019 49.7703686117 28.7704010275 12.4112682408 35.2671782942
-ONOS3
-13019 48.3486366824 28.6472976101 12.4114088561 35.4806994928
-
----------------------------------------------------------------------------------
-ONOS1
-14618 49.576578555 30.8922696843 13.7378230586 36.2757731409
-ONOS2
-14618 48.5440020686 30.7811465304 13.7316956109 36.4328337041
-ONOS3
-14618 49.4866717797 30.8087248031 13.6891587016 36.6357205954
-
----------------------------------------------------------------------------------
-ONOS1
-16187 49.4907941638 32.9074922652 15.0888963838 37.2077993376
-ONOS2
-16187 49.6285423582 32.7484269078 14.9693742032 37.3552104338
-ONOS3
-16187 48.8755660723 32.7250364726 15.0063681262 37.5478060295
-
----------------------------------------------------------------------------------
-ONOS1
-17725 49.8836746982 34.5479805791 16.2364648337 37.9435104425
-ONOS2
-17725 48.99884514 34.4732673007 16.246116043 38.0836022622
-ONOS3
-17725 49.4211281632 34.4116883879 16.1694233436 38.2662174542
-
----------------------------------------------------------------------------------
-ONOS1
-19354 49.8626223455 35.9745646504 17.3266700853 38.7671511869
-ONOS2
-19354 48.4587733895 35.7738406011 17.2944948224 38.9024055739
-ONOS3
-19354 49.6238625297 36.107629579 17.4523301701 39.0742037951
-
----------------------------------------------------------------------------------
-ONOS1
-20949 48.7735412886 37.2334176044 18.4738354902 39.4261732644
-ONOS2
-20949 49.2808245039 37.2112430739 18.3974292802 39.5555564351
-ONOS3
-20949 49.0412343145 37.2603304894 18.4613220964 39.7222890977
-
----------------------------------------------------------------------------------
-ONOS1
-22518 49.2233054229 38.459058778 19.5122554055 39.9666332511
-ONOS2
-22518 49.3199190997 38.5500864358 19.5788242673 40.0902311981
-ONOS3
-22518 48.5868586294 38.3006063004 19.437642791 40.2494766808
-
----------------------------------------------------------------------------------
-ONOS1
-24059 49.2130863162 39.6417956777 20.6446125264 40.4016538809
-ONOS2
-24059 48.8272590697 39.4712361736 20.518926366 40.5198056741
-ONOS3
-24059 48.7738335012 39.5215088361 20.5824985986 40.6715650211
-
----------------------------------------------------------------------------------
-ONOS1
-25687 48.7438034983 40.4560575512 21.5487100295 40.9303516742
-ONOS2
-25687 49.5471148575 40.6750208451 21.6586836347 41.0440523285
-ONOS3
-25687 49.5528136103 40.5962066501 21.5740317285 41.1905085161
-
----------------------------------------------------------------------------------
-ONOS1
-27208 48.3440895308 41.1892039746 22.4234679597 41.246260379
-ONOS2
-27208 49.7248389814 41.5217226735 22.5714921035 41.3552443508
-ONOS3
-27208 48.9489326527 41.4186969689 22.5835508207 41.4954641517
-
----------------------------------------------------------------------------------
-ONOS1
-28764 48.636023504 42.0763468157 23.4482599273 41.5834003461
-ONOS2
-28764 49.5204659279 42.2043214958 23.4251146139 41.6880977866
-ONOS3
-28764 48.7203412028 42.0949248759 23.4349162749 41.822682997
-
----------------------------------------------------------------------------------
-ONOS1
-29669 41.3110354992 41.1541779314 23.753983268 40.9907471033
-ONOS2
-29669 40.0637318705 40.9112993447 23.707965358 41.0894107566
-ONOS3
-29669 41.8871662556 41.2877306835 23.7807095826 41.2163432863
-
----------------------------------------------------------------------------------
-ONOS1
-29669 23.0530097167 36.6223527412 22.847948773 39.2515156116
-ONOS2
-29669 24.299881722 37.0180744675 22.9307258039 39.3420203293
-ONOS3
-29669 23.3745109274 36.7411989007 22.8736556812 39.4584630811
-
----------------------------------------------------------------------------------
-ONOS1
-29669 13.9823571918 33.1372750967 22.0989039162 37.6540346
-ONOS2
-29669 13.5601880389 32.9417096657 22.0560923439 37.7370627214
-ONOS3
-29669 14.1773575332 33.2448115489 22.1237680517 37.8440976097
-
----------------------------------------------------------------------------------
diff --git a/TestON/tests/scaleONOS7nodes/scaleResults b/TestON/tests/scaleONOS7nodes/scaleResults
deleted file mode 100644
index 2488306..0000000
--- a/TestON/tests/scaleONOS7nodes/scaleResults
+++ /dev/null
@@ -1,51 +0,0 @@
-[2014-07-25 15:15:35.933098] [scaleONOS7nodes] [CASE] Starting SB load from mininet with 20sw added/removed 10/s duration: 360s
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4, u'mean_rate': 0.059200312795650786, u'm5_rate': 0.0, u'm15_rate': 0.0, u'units': u'events/second', u'm1_rate': 0.0}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 189, u'mean_rate': 2.4356254535500663, u'm5_rate': 0.41843186533973237, u'm15_rate': 1.9369051806194815, u'units': u'events/second', u'm1_rate': 0.14129996658762756}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 305, u'mean_rate': 3.4808906901728482, u'm5_rate': 0.9457303370098417, u'm15_rate': 4.174524246234802, u'units': u'events/second', u'm1_rate': 0.3220664415995731}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 470, u'mean_rate': 4.813391854440621, u'm5_rate': 1.3653129541121973, u'm15_rate': 5.67074120039854, u'units': u'events/second', u'm1_rate': 0.47005007387755343}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 554, u'mean_rate': 5.145399853971431, u'm5_rate': 1.6878416231510096, u'm15_rate': 6.5221406321995365, u'units': u'events/second', u'm1_rate': 0.5886241207705653}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 670, u'mean_rate': 5.692871627444301, u'm5_rate': 1.9211151858691953, u'm15_rate': 6.874390831538807, u'units': u'events/second', u'm1_rate': 0.6793689049109783}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 782, u'mean_rate': 6.122985062753683, u'm5_rate': 2.298585202117126, u'm15_rate': 7.903041256773227, u'units': u'events/second', u'm1_rate': 0.8200558382406801}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 928, u'mean_rate': 6.737355933051502, u'm5_rate': 2.5440190839839243, u'm15_rate': 8.182751878849528, u'units': u'events/second', u'm1_rate': 0.9192254774790037}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1068, u'mean_rate': 7.2277027669966225, u'm5_rate': 3.0582120448420502, u'm15_rate': 9.742318376899973, u'units': u'events/second', u'm1_rate': 1.1102756658184045}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1178, u'mean_rate': 7.465643586983538, u'm5_rate': 3.3117994889825484, u'm15_rate': 9.89957751878761, u'units': u'events/second', u'm1_rate': 1.2173187929330158}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1272, u'mean_rate': 7.579869789467111, u'm5_rate': 3.491942657341365, u'm15_rate': 9.73588659125985, u'units': u'events/second', u'm1_rate': 1.3011290230067005}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1372, u'mean_rate': 7.714903896910294, u'm5_rate': 3.744533557606514, u'm15_rate': 9.958097598081375, u'units': u'events/second', u'm1_rate': 1.410495416418516}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1502, u'mean_rate': 7.995257880751603, u'm5_rate': 3.9832156189264327, u'm15_rate': 10.137227344552151, u'units': u'events/second', u'm1_rate': 1.5165477887836256}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1618, u'mean_rate': 8.17649661132665, u'm5_rate': 4.232923512725775, u'm15_rate': 10.361789679493679, u'units': u'events/second', u'm1_rate': 1.6279660102909048}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1796, u'mean_rate': 8.638436983286626, u'm5_rate': 4.625961247189527, u'm15_rate': 11.274683186266738, u'units': u'events/second', u'm1_rate': 1.7890611156116576}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 1898, u'mean_rate': 8.70908577788645, u'm5_rate': 4.940218041617326, u'm15_rate': 11.732722831544308, u'units': u'events/second', u'm1_rate': 1.9262401293788511}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2014, u'mean_rate': 8.834979322143473, u'm5_rate': 5.086044615238827, u'm15_rate': 11.36565719225259, u'units': u'events/second', u'm1_rate': 2.00877929586214}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2096, u'mean_rate': 8.80741944058602, u'm5_rate': 5.23446678354358, u'm15_rate': 11.104825178674638, u'units': u'events/second', u'm1_rate': 2.092708438681387}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2212, u'mean_rate': 8.919169787587151, u'm5_rate': 5.42342880661179, u'm15_rate': 11.087454018930082, u'units': u'events/second', u'm1_rate': 2.1911244042226627}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2302, u'mean_rate': 8.921505549289213, u'm5_rate': 5.527733113130847, u'm15_rate': 10.709420105909206, u'units': u'events/second', u'm1_rate': 2.261958400590161}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2424, u'mean_rate': 9.043024690304492, u'm5_rate': 5.7730856298958795, u'm15_rate': 11.070016034135019, u'units': u'events/second', u'm1_rate': 2.3806525506070884}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2558, u'mean_rate': 9.198907190307924, u'm5_rate': 5.977993104861085, u'm15_rate': 11.230685676223507, u'units': u'events/second', u'm1_rate': 2.487028536364942}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2652, u'mean_rate': 9.205141639750474, u'm5_rate': 6.102910924894121, u'm15_rate': 11.002099225101214, u'units': u'events/second', u'm1_rate': 2.567791053544984}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2758, u'mean_rate': 9.251221641461491, u'm5_rate': 6.236628457203367, u'm15_rate': 10.864897965206772, u'units': u'events/second', u'm1_rate': 2.6520564660056722}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 2866, u'mean_rate': 9.300808867298466, u'm5_rate': 6.4461734461098965, u'm15_rate': 11.153003681875704, u'units': u'events/second', u'm1_rate': 2.7620817265483906}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3000, u'mean_rate': 9.428962629183438, u'm5_rate': 6.549131070407777, u'm15_rate': 10.904360602384472, u'units': u'events/second', u'm1_rate': 2.837588952255399}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3114, u'mean_rate': 9.488273497253953, u'm5_rate': 6.760779624902542, u'm15_rate': 11.22991528533686, u'units': u'events/second', u'm1_rate': 2.9498980541385973}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3232, u'mean_rate': 9.555939548927737, u'm5_rate': 6.971335992976415, u'm15_rate': 11.519573501287377, u'units': u'events/second', u'm1_rate': 3.0630963037697176}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3322, u'mean_rate': 9.539302128630185, u'm5_rate': 7.005059610420453, u'm15_rate': 10.979254648249038, u'units': u'events/second', u'm1_rate': 3.117647167706458}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3426, u'mean_rate': 9.562668411317048, u'm5_rate': 7.168703957115292, u'm15_rate': 11.13340055572298, u'units': u'events/second', u'm1_rate': 3.2157814313436766}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3556, u'mean_rate': 9.6553664830416, u'm5_rate': 7.30835119706793, u'm15_rate': 11.196064287702198, u'units': u'events/second', u'm1_rate': 3.3063182176268193}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3690, u'mean_rate': 9.753744409437841, u'm5_rate': 7.436043897518086, u'm15_rate': 11.19922564971827, u'units': u'events/second', u'm1_rate': 3.3935526056733525}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3862, u'mean_rate': 9.94485575877501, u'm5_rate': 7.716475942451841, u'm15_rate': 11.928560772404543, u'units': u'events/second', u'm1_rate': 3.5328121098263545}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 3962, u'mean_rate': 9.945657010947713, u'm5_rate': 7.921927978095857, u'm15_rate': 12.23377875835498, u'units': u'events/second', u'm1_rate': 3.6484090746318865}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4074, u'mean_rate': 9.975814947863958, u'm5_rate': 8.00901532078311, u'm15_rate': 11.966342332818853, u'units': u'events/second', u'm1_rate': 3.7251416456063717}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4156, u'mean_rate': 9.932800200694953, u'm5_rate': 8.054999692711906, u'm15_rate': 11.58131193842906, u'units': u'events/second', u'm1_rate': 3.7878895918323345}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4290, u'mean_rate': 10.013202869430945, u'm5_rate': 8.197664300462709, u'm15_rate': 11.712109833999651, u'units': u'events/second', u'm1_rate': 3.8830746138276506}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 9.97133516767342, u'm5_rate': 8.191184093898045, u'm15_rate': 11.142233135267437, u'units': u'events/second', u'm1_rate': 3.928565036650824}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 9.748514038149732, u'm5_rate': 8.052687964347193, u'm15_rate': 10.02019824138421, u'units': u'events/second', u'm1_rate': 3.9292315920501197}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 9.535437429356055, u'm5_rate': 7.788689451274274, u'm15_rate': 8.481914691112806, u'units': u'events/second', u'm1_rate': 3.885815112583944}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 9.331367778702917, u'm5_rate': 7.533345838926838, u'm15_rate': 7.179785778108208, u'units': u'events/second', u'm1_rate': 3.842878368314098}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 9.135919987284627, u'm5_rate': 7.286373385909162, u'm15_rate': 6.077557449798136, u'units': u'events/second', u'm1_rate': 3.80041605835342}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 8.948532183901525, u'm5_rate': 7.047497652974929, u'm15_rate': 5.144541313226928, u'units': u'events/second', u'm1_rate': 3.758422940387489}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 8.76863771104249, u'm5_rate': 6.8164531980665, u'm15_rate': 4.354760204591356, u'units': u'events/second', u'm1_rate': 3.7168938300274155}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 8.59583194470271, u'm5_rate': 6.592983281351978, u'm15_rate': 3.6862249294674947, u'units': u'events/second', u'm1_rate': 3.6758236001697906}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 8.429632452341373, u'm5_rate': 6.37683957993232, u'm15_rate': 3.120322036630427, u'units': u'events/second', u'm1_rate': 3.635207180363701}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 8.269862736358995, u'm5_rate': 6.167781911901452, u'm15_rate': 2.6412955797811177, u'units': u'events/second', u'm1_rate': 3.595039556184744}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 8.115976079788764, u'm5_rate': 5.965577969452773, u'm15_rate': 2.2358084383190753, u'units': u'events/second', u'm1_rate': 3.5553157686159524}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 7.967761632050002, u'm5_rate': 5.770003060735474, u'm15_rate': 1.892570983393321, u'units': u'events/second', u'm1_rate': 3.516030913435567}}
-{u'name': u'Topology.EventNotification.ListenerEventRate', u'meter': {u'count': 4372, u'mean_rate': 7.8248239429659785, u'm5_rate': 5.580839860173803, u'm15_rate': 1.6020267505007044, u'units': u'events/second', u'm1_rate': 3.477180140611569}}