From 385b134dcbfad2cb381fe9f2bea20a6c593cdda1 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 24 Aug 2012 16:01:24 -0700 Subject: [PATCH] Update OLSR test traces due to random variable perturbations --- src/olsr/test/bug780-0-0.pcap | Bin 92760 -> 92760 bytes src/olsr/test/bug780-1-0.pcap | Bin 92884 -> 92884 bytes src/olsr/test/bug780-2-0.pcap | Bin 104274 -> 104274 bytes src/olsr/test/bug780-test.cc | 16 +++++++++++++--- src/olsr/test/hello-regression-test.cc | 3 ++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/olsr/test/bug780-0-0.pcap b/src/olsr/test/bug780-0-0.pcap index 32b471a3f13466c5fc543b3e714d64e80f72176a..65bac6018158a885caee5eb997b13c743ff4a287 100644 GIT binary patch delta 2010 zcmX|BX-rgC6y{tW2v%7JN@j+|nTLo~kVT46T!6X%EsIje|ooec%k#k7=6ddAYd!} zFzBWe&z*9y@BkUd7K-CSu!sX6mHOdoBOV@NwGqi`!YREf|KFp%yfO)siCI6|aY<7= z%Z|fCb}JrgQdmlYe0aX;O@A$62p8OJ!?4qn*s96H12&~$Vv7SSPiw3^ZP#O~t~BQZ zI@~IjozWnImuG-YA2^f7K;;+wLB)a=7sSy*Y#7EdWZrs}ps9HGPZj@d zbwQ?N-g;Hh%YIs?z$Kh^)Q&H%uZLdxM<{N&;m-=Aq>bY@G`2iS*qG3k$lwDhZu2b- zHcQ^;w7pJ-bWf_$poyA33yN{+R>+B@k_ft^2yvmy3+nZy8eDbMa!q!fClmM>4O0p z+dq!Rrajf*W4XPir^9p;o|$yVpCvM^>sImk3yrG_NXX`wpsP@U>EmCk)7=JPO`mrM7t$MzT$amy6+*;p9|o#!w;zcc64y z7D;HEBpHY#FlRADJ=a0q0)AM9NaLDA3z=|MEtWH_wEEp1~$<`pGX^zp9t&OBAfVp_@1C|$}$JK z?>PDDILdns2DjOa?l@sZ9tBTHAQpKQMq`3-{+YSVT}jmcQe1{%NftB34}zDZP}lrL z823`d4y4DTRB9JU@UN)?EJGciPF*w9+H~PYUNE<3P}^Mmz6@d9GlQ6w>D2vHx~ZHl zz}(a^FoXJsC3RV*kR2<2L%cPc+$3@5EJ`)!ZAz6piYdM`Gbz)?#gyq=vj~h0y(<4= z4qcRpbktn(hZXl#-aC&-&zaZp-h9DoZt!dl_00`VT_D^&DIsYma;ZDZL{G{S=qch` z!pjSWF8I_!p*Y$+><<@FTPC_^Azj(PB5}gz-MmvYbT^$vf?j5tyO`()GrhhTR7Fa( zEE|@{4=p90JW6NtB@_7_mA0=sf4j{p+xE&+|LKkMnY+%jZg$ zPgRXo-1fsN(}s^v_~CC>m-spmoh?@1L@zI|Ng>!fLFTNacbz5t<^ zW%Cy~;n=ajfhl$u!QtynKebCGLp-#xm;r3R|R*}<_n`r{ptN}y%#!Kry8Hs1%tRX0fT>W z;JMQ-@zq4O<3qBeKUmp;ck}&lvl$N|c*u+prFL?!$p5^<%WDzMEW*X#+i`7uyl9QZ zQo9vP>n)-_o*$mCf8KvEetd3HgAK#Z%o6=`JPXE>F`+3E_ny&(&kMyvR>RWZ1jxhc zJ_i<@)x|qusyTXgu0YEr4V_K8aB{1o$qBgTtcFXPbqL4dVHyXprhG= zd0jfR(>>XYf4bD9d}|J9xVYQ(WVE^4!{NEB;~bj1Eyn4q=>l#saCna{h8g&1j}zp* zEf9r4y)JogDcFrqdlQ7bp%dt}YdUP_RhzC8XgBZg?9(y#ksUW(w;0)f#R)LjtK
u4>i{ zZ3C?8i^BcGE>TA_;YQ#+l5v}<07l z8723(kBf*MV-ZHh7!8%MfCmqC92&M8yB{@zY}p9f;nzTivbqbfjBpfD8RreUa4Dwd zDQ_U-Mq)sdQ+z;|#ojQ*Jmv%Ae#oH-^qLJZclpt*+dbLm54>4Y(_-pRLAt=2K~1&? z5J+?ofjB3^a&QZjO@Rc$3eB`2AgUanJUEGXaDHZRh~lBFm4#0egi26S(_;FD5*hVN zlzcS|+}WC4VbBQhCabBj63V-*CefzAFDg^z-pRD{C*`VX2`6x-R}kT*XE#S9)F}He zGa?l|`K1OCW_u*jb{jHJa~one8#KreGAWtZMNgw`D|y@TY03{biLmJ&5=W*Jvg}(x z!vix2_ygv!Efx|%EDWLlgEkpI6LyNNHudrNR?^3Fcq%qubI8qc;1VTMr85@7&6{yb zx4K`MG@D@ffX&+3N_eVDS{BbCexX@lH$xIVE4L(hR^CWb{M=S&Cwr{^J(-5pVasPz zXf|GcluEi!rKq_0grq%{!lfHBzepwBSlF*gOB%KEd+p}lG!+!98(rvGRj^1A;P~2> zJc-ZDcv0D0yHh#o3Zg`~xybm0S}+S_hZWptgdVZ@fZ-PtL7z zx%=GA`6~#MUTd;4lLq7#>FXw<}QQxEtSx?~V_S}87EHa3Xv_!M^P;7ScA0l!3Sg4<0t{;BJVJkMRX!fw-Flyj6%@%es z3bmd5M)NjSAH{dRi10s%+~63c9bx08H$ALRM{NfWerDtK`1?VhA|7=c$tB?8Q7vAU zmoPOoH3|C**_KpkrXtgD`h&|%y44L}C+{xP+1kuNMi;;cyfyct`gz&EJqwHabG*yl6lk7Zs$i=zO z%RYybCx1eVV{2QTX6EB140cJ~x+ge4U6wVyjST9PY}s>!3zWdRzD~wd`ZP1=6@teU zA^8oG-Ku8q5WgZletnPdaRqk_WHXqh>bOC~x2pR4kPi$?KIrD)@HGY*D6W~eM!LbM z&B8oa$L>v0Pk!?OXM>tqJ>JNSCI=pGn80pHT=@&Jv{i`3PNGtVvAP^Iu^#}3wviiA zXaRIqMd?JYKcEE?a|!!&#N`lS2>_H+F2$Fb#8)=O+hA&_ke)@8{r{v(v*}=yoU|t# zP`XHwdK`E_$uw~}niR?kusjt@Xq+3%au=awS!~o%*C-ALT`YG4Zc{nVoKNH<(V!VK z;$Z~hji2#Q#TMFWuhs_KpkbU(KxC~$?v#*HC+<}2@W2vAcO@Prk*7*}D8iFMx1kmy zey5SVbTX1IGYEWdqo7tGu4h3fgWWP$T@K|n2Lz-~s zqa?pHpot>|6hHt=5%m_gZ5eRH zpGG2RFr^zEGfbO{qW9D%YG8(y7B(4Jkx}h)ZrI0#bJy8>t+m%afu7(%PjGX(iPaHo ze}{{;Cr@F;W(DqwU>&9#*GIB5tuA&X%E|tiUaZ#G!lVM+rO8X^<6}-pV2w+htSzY= z*$n2H8*gRK+H(}oMX)ceZhSM1+CA)tSQx5B1qEdV(Z>%2Q&V1x7o%cj18Zn;;OPWX z_plo+6?id$?dXpW*+;eEZd*Ox$x3f}@wQItE*9DAWR3LuSf4Bmo5fR$Kxfli%kjay zNmk*d{sMfvNST>P=bjMIt(03nz#8pZTOZ24puU74V6HS{#g3t3av_g`Yui$@5<+?P&r%LjbG(q0%=>R>a% zR=W>}sJNGJsG@@L*GLyX*r?rgd|ZKsb@)3OD^Z1;e=05Icg-(i9SS4X#6OwH(^i2Y_5hHv5?-4{ zKkFPo8MkYK0{7dtM06-jG6+XFJVq86HN>X~3ERTrRV0z%h!hmpqUl0;7w2OLmPb?U zj)M%uT2&EnNy&T4v$)`aNeQNsTit8{|NiDcYjk|^fTSr<9U+NMiT#zdVOjz`!n(gbgOtz! diff --git a/src/olsr/test/bug780-2-0.pcap b/src/olsr/test/bug780-2-0.pcap index 8778f1e1390452a4ebd0e4c937c1af9e270332b9..2d56a22fb2d975bb274d351e4bf732d8ee62ced4 100644 GIT binary patch delta 2037 zcmX|Be@v5C6y?4`VT{nxVQrfV?bnP&9R$&t$tGcygauV)uRG%iyY6ESgd0-|%o5p}2w+o}@QO-*q3z0dX^-sOJhop;W8 z_jUM$arlI>x5UayO_;yPYAi@dNLXaXkB`{)JxRtEYaSS}yf+gsWhW(xZ-d&9wRSsG zO!(Y>CteS#ti>8H+jHXOH?PFYjSlGD-J*eQiPL-{(;_`!j=AS2* zgG=QS+$$E`e5jsvUJ<3C`+5RCSmo6Ae*G!H4a_*ai%q1Vv)jQEOcaq5uN}@~S|$!2 zvEgqMDL6Zn%T8tD@_s9B4J9)7Oe}uYhF^p>u`vfuha7A$TO^B}h7?@fmCNid+}P!1 zGhUD%ljrh$Gq~_^myc!4jkCP>67BJ_oB}$=%km54`O*2f)o#Ok$C9z4TV;KVu;REw zyVX4jxUNsZ=rI+RAw0Bc4aeUyz*p!Rb>T#h3TrXrnoXNOV{UGMOO^?E+72Wh0^qq&sV>^}GRSbf-?~H<7cYWZMbUA+z-7QJi`lkv9WHa?IGSVoU zN<`)3)nL~SMF`l>D>smuKgT$U#)9F>~epU|l?DSiS#)!D*%3PD$W>61wA!fc4L`7fiNP%n4%o%-+aN0(azK#*q7r0u5~xoE681Z#0A5>0COQ@H zJynq9CIy%{rtsz*5<68&V%dwrnH&S|pG_34lEOGgh?Q5uYjTA%x|8rkt{@Ibzbv1? zWqc?XW`+IvLdSr7ApFjJ`p_&A4yy|YuV>k~FqY-?LUP8}<$#-iSO`9z=oXn33T8b? z^Ws>N!No#_hx{r0-(vDHEt70`9SVRh(X`)A?es1mp>~;!_s$k^YYW;4JY7rO1_^Gg6X1UN+s1!? zKklQdfzaZ$@$K6Ptf%>Co0wjGd>VF;GC4lc9fDZ=zVP%W!s=lLnqV|Z*Vej|y1KSh zKOLuA+q^qwEwWqK7|$kxx;>&aek7+;@ybgc) z@fXj!cag(Jd5Ab9zr}aDl-3Vz8dHcRW95XAHM3J0QtHB<_x*a;U+;6z_w#<9&+~bn z_lA0`Lp|2sq6F3%jae@yShK^z!eZla=W+Yt$FuOggiP@Bu_%bgD+?nc#K#T#U_xyJ z8=r$QN1XUetHzGRheB6MDBQUu6n2z`!j>KxM)?A)G+KrZuCdAmq0sYeD10?P6c(%t zg`fF?p`PA00n9Iicv*}P;bnmgd9*B-M{b!sZr9S`!Q7)QSb!?NbyQ=k5^>EZUY7Zc zJnk-+$B8C!;FgYUZ0VOGwCw*X4DXdX_5Gjj2B^f?W6i8C3Y}dJwkVoBa^lFbOm=N9 zUOjHdUvEWXnm+@^`16J2SO2L9-0BZ!3+H40OLjcyuV$kQaK`UoKPCx#@u(#dS9E5u znIzoY>0%F5`Eg$w&x(U&eAMY?AEx1&z68ngcRJm1u@hNT%Ei9Ok{TMaajRm-JKeLe ztV?4#FJRe8hd$ml3GA=fC!eaJOU%!%*PmQ#!SFLG-a4hhE;CovI}JG8t)l0&2Crf4 zh+SuTl?9G*aDa*j``oZeW}}U1fMSdtP;v1YH_XA}Uc2r;LyX(LRZ%&o!Jx_5c8-7p zd~6e4*ZbWVGot9(Uwb0h1sl!4j#s{~W}bPNcfrAyDVWvm#KsF6%Tq+7)(>dCepn!c z^E>$vi76M|Y;8*F4AS}765{>%k{cI|DY|lb8u)NNWwHk}_!r@FqTV-gsVuSOwUi6RFpYfY5|SkTTZ#|Yi_bz^pie9xMhbR1q(;r7(cA&-;5Sm z;5r`ePsY^i8hm87eVtld$3OSc<^CIPh?NfIjS(~(cTF_oRG*@&zm+rSpqnao{_f^e zD?!my|0u8seiirrsqu+QO3l7aTx(?kHK0MXEYJ}kDl=)F3?{vkgiM#n_9+c+nsz7M zr$(x9)9GYv`$vOR9Uj=oCyag69E6;HRA6DF<~rCOSA);I>3b}?5I1=bkQWmsE zrEG>&PCpY3zeA8}!VqqC5~(V@GrUeBl_v9cRdABaMp6pNHItsyV3IAS#&Bvz<=!;9 zenQ$}SknbmEETWHp!AGny_G?%J_mVV$r6hAUW(f(>eSUK(fm3B)+A`5sp4>s+ zlw-P}7&AH482@f5F*oFrh;7BB>|riprHHr{|BGl{Aw*PcBD<`NNqo-UHH-)xU z1cfSY0WE2y;WSl}pj chan = wifiChannel.Create (); + wifiPhy.SetChannel (chan); // Add a non-QoS upper mac, and disable rate control NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default (); @@ -120,13 +122,21 @@ Bug780Test::CreateNodes (void) wifiMac.SetType ("ns3::AdhocWifiMac"); NetDeviceContainer adhocDevices = wifi.Install (wifiPhy, wifiMac, adhocNodes); + // Assign fixed stream numbers to wifi and channel random variables + streamsUsed += wifi.AssignStreams (adhocDevices, streamsUsed); + // Assign 6 streams per Wifi device + NS_TEST_ASSERT_MSG_EQ (streamsUsed, (adhocDevices.GetN () * 6), "Stream assignment mismatch"); + streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed); + // Assign 0 streams per channel for this configuration + NS_TEST_ASSERT_MSG_EQ (streamsUsed, (adhocDevices.GetN () * 6), "Stream assignment mismatch"); + OlsrHelper olsr; InternetStackHelper internet; internet.SetRoutingHelper (olsr); internet.Install (adhocNodes); - int64_t streamsUsed = olsr.AssignStreams (adhocNodes, 0); - NS_TEST_EXPECT_MSG_EQ (streamsUsed, nWifis, "Should have assigned 3 streams"); + streamsUsed += olsr.AssignStreams (adhocNodes, 0); + NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((adhocDevices.GetN () * 6) + nWifis), "Should have assigned 3 streams"); Ipv4AddressHelper addressAdhoc; addressAdhoc.SetBase ("10.1.1.0", "255.255.255.0"); diff --git a/src/olsr/test/hello-regression-test.cc b/src/olsr/test/hello-regression-test.cc index 155055efb..461b6510c 100644 --- a/src/olsr/test/hello-regression-test.cc +++ b/src/olsr/test/hello-regression-test.cc @@ -75,8 +75,9 @@ HelloRegressionTest::CreateNodes () InternetStackHelper internet; internet.SetRoutingHelper (olsr); internet.Install (c); + // Assign OLSR RVs to specific streams int64_t streamsUsed = olsr.AssignStreams (c, 0); - NS_TEST_EXPECT_MSG_EQ (streamsUsed, 2, "Should have assigned 2 streams"); + NS_TEST_ASSERT_MSG_EQ (streamsUsed, 2, "Should have assigned 2 streams"); // create p2p channel & devices PointToPointHelper p2p; p2p.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));