From c200e9a8b2c77f0cc15ff3bd64cef2f24c4cb249 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Mon, 29 Feb 2016 18:21:32 +0530 Subject: [PATCH 01/57] testing --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..45b983b --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +hi From 91ddeb832660c4a8a58104429283692e31a8cd84 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Mon, 29 Feb 2016 18:43:01 +0530 Subject: [PATCH 02/57] fixed header and button color --- ntt_tool/__init__.pyc | Bin 0 -> 163 bytes ntt_tool/apps/__init__.pyc | Bin 0 -> 168 bytes ntt_tool/apps/cloud/__init__.pyc | Bin 0 -> 174 bytes ntt_tool/apps/cloud/admin.pyc | Bin 0 -> 231 bytes .../apps/cloud/migrations/0001_initial.pyc | Bin 0 -> 3020 bytes .../migrations/0002_auto_20160225_1631.pyc | Bin 0 -> 847 bytes .../migrations/0003_auto_20160225_1726.pyc | Bin 0 -> 1305 bytes .../migrations/0004_auto_20160226_1322.pyc | Bin 0 -> 1002 bytes ntt_tool/apps/cloud/migrations/__init__.pyc | Bin 0 -> 185 bytes ntt_tool/apps/cloud/models.pyc | Bin 0 -> 3491 bytes ntt_tool/apps/cloud/serializers.pyc | Bin 0 -> 2822 bytes ntt_tool/apps/cloud/urls.pyc | Bin 0 -> 601 bytes ntt_tool/apps/cloud/views.pyc | Bin 0 -> 3940 bytes ntt_tool/apps/core/__init__.pyc | Bin 0 -> 173 bytes ntt_tool/apps/core/urls.pyc | Bin 0 -> 391 bytes ntt_tool/apps/core/views.pyc | Bin 0 -> 776 bytes ntt_tool/settings.py | 2 +- ntt_tool/settings.pyc | Bin 0 -> 3451 bytes ntt_tool/static/css/custom.css | 58 +++++++++++++++++- ntt_tool/urls.pyc | Bin 0 -> 1556 bytes ntt_tool/wsgi.pyc | Bin 0 -> 622 bytes 21 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 ntt_tool/__init__.pyc create mode 100644 ntt_tool/apps/__init__.pyc create mode 100644 ntt_tool/apps/cloud/__init__.pyc create mode 100644 ntt_tool/apps/cloud/admin.pyc create mode 100644 ntt_tool/apps/cloud/migrations/0001_initial.pyc create mode 100644 ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc create mode 100644 ntt_tool/apps/cloud/migrations/0003_auto_20160225_1726.pyc create mode 100644 ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc create mode 100644 ntt_tool/apps/cloud/migrations/__init__.pyc create mode 100644 ntt_tool/apps/cloud/models.pyc create mode 100644 ntt_tool/apps/cloud/serializers.pyc create mode 100644 ntt_tool/apps/cloud/urls.pyc create mode 100644 ntt_tool/apps/cloud/views.pyc create mode 100644 ntt_tool/apps/core/__init__.pyc create mode 100644 ntt_tool/apps/core/urls.pyc create mode 100644 ntt_tool/apps/core/views.pyc create mode 100644 ntt_tool/settings.pyc create mode 100644 ntt_tool/urls.pyc create mode 100644 ntt_tool/wsgi.pyc diff --git a/ntt_tool/__init__.pyc b/ntt_tool/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7eac2efb07fef4df13ea90d8381a4ec497e27838 GIT binary patch literal 163 zcmZSn%**xF_DWbX0~9aG?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=kB`sH%PfhH*8@s$ U01dRs%}*)KNwou6TMWbu06$_WH2?qr literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/__init__.pyc b/ntt_tool/apps/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a6e91fcfa3e23c7c46c617688ff1f752e3b4e389 GIT binary patch literal 168 zcmZSn%**xF_DWbX0~9aG?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=Pb?@X){l?R%*!l^ ZkJkgrasW-W$<0qG%}KQb*G?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=Pb?@X)(30SkB`sH d%PfhH*8{5I0Ge%+o1apelWGTYK`{_B002^IEolG% literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/admin.pyc b/ntt_tool/apps/cloud/admin.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5f88618ac9688b755c992b6e71222172b4d173f7 GIT binary patch literal 231 zcmY*TI}XAy40T!|AtabMM5g8ffH(mIAO@DIG!YaMyCUwuJ-G>D2B#n-Ea&<8^Bm`o z@#s0f?`rs3CUGe*P6e#E0uK-r>=h`R!A9rOXkKDk3FCo4WkZ82owPg=u;&VoRMdog zZ4PUxfc}TLmE4>tID_s&zKe#?)t)+Ae$)n;xnv@rSWn9K#wWsGZmPD8rWcw1ghB>} QvUnEAcHS-0fiZpj2DX?x%K!iX literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.pyc b/ntt_tool/apps/cloud/migrations/0001_initial.pyc new file mode 100644 index 0000000000000000000000000000000000000000..dc5286c1c24fd572b992e515aa399d185dc3f3f4 GIT binary patch literal 3020 zcmcguS#KLR5T2D}`G_4mhn=M9;WPoF7h6sb_e#<@wu1((Q$ThC)Gq`jQWE9Wa|OGkAvxb%V*U4pxj*jx_N)iRr;hIjP=j3HK;d5m zF~B&2!w4dp*C4LJxDJQ)Ft0=0fbkR@PQkbdhs}UCAfAT98BkN8r(iS-{RmVOeg${| z@YCTes0Qq}rtu8(7k*k1j@%MHd}4Z5X%QQzGa2VWGJ}#_J7wF}c1w{4zimej@ zA27I7>U>zyneh4ORp9EYz#A{`_Hn6m6V$h$9)Q{c^$^rH45mP>gSy4RXyfU1vT&nV zPNF*qa)jR5o9Yu@egV{{pfAGc5{xh{F2iUU)MubR#|>+E$^ZisoWA)_r+@Kpoc?7= zubNO_mEhN$hAdLwgqSnQcjvSDMm~27KI-0^)QZvx%&{5*^ZO<90rrX&=&LNOyW-PN4aimYU#B-e)8Jk}; zt3TIS*XCOA-n7l*9bcXmnuYvX#5x(cp#khR{sQXYR=Kl@7I@fD_$)RzvD5g4s>sth z*a*(7NM)WM+f121Np!io!s$dNE?7cssvse3;;4@?vBVyGlKE5-L6S{KqfAJp9Cb&V za(`o!dgLvkw38;zJ#D4B!pUx|J*{PD9%QoLH$6|?PR6l4#=WsCIw?|}^>pIoKzr)5 zPUlW!I`^>?sdPj3N8-m_oeA3)NbN{xxhKbGdTgB*{u_CLmgj86UtyH=%(LaWw%gK~GonkA+8D%fWgHzEa z_uQ zCY)C00Ob$op3VGnsUivkMA$U^nx2gV|HPKAetj@rQhR+wg4)}|a;o>{*tD)787?Kk zMJ5CnxDa>&@Ug}z75+hn&f*J3VjMP#4u^(9nIFqErLw`Gr8-eM>78`=0aLRYOF!xi9U}g`-0`%vrF79qSSGF^Icg-6f#pn7U3LTK9$tf(?)KLH z_SViWyToE8h6_>)7sBZy@8h&Rv}4^)^pTBy-o`e_87sp6?Zi1JoV78Hcp%aftnp+r zZ=)OYHZN+QUd7rQ8yk0o2~J;6PdXF~qLDwtN3+(fFE?hRX6<&gT=`zF)uXw3i7%pr z{^`3IZ4{%mmvnA0dOO-cv_<W=(U%_*kkfMJv&K{co_)#k&9i literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc b/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc new file mode 100644 index 0000000000000000000000000000000000000000..754b84cc4c664b3f177f52a62118a35f30648f9b GIT binary patch literal 847 zcmc&zO^?$s5S@IqyInx4w0|O}O&Y|WScEumgF{wAq8H1=)7Fb)hkDGaXZVTy6SQX- zJKgP#D^4_-=ds6c-Z;hY7Z(pVzdrSF90h;hLJt0h9mQ`324Kiwok13H4km}8fOWyR z04(6HgiQvjgr5LE06wovP&2r#=A1$Q;ZbGm(UMKDx_1hN(S&@`iZ6549g(oiD7+>Eetz;OAvlJ;`5(LJG+mOP#FyfbQA6q8H=@m-pLDQfY4iaz70 z_dBtbg!l4L<&6KqAnBDdh_qjb#7T(3sbG*{JWk<=R-x@R`Y!1jkLj4*fbTULl{UGN zzAvm@zBN6qjEl~JTDgIBAfH`v5E~jmbnQO_FQJiQ;;sf hMCeL=Nrk2)r%ICdf67TsdOfw}P5fbe$!3`^i@zy()ZYLA literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/migrations/0003_auto_20160225_1726.pyc b/ntt_tool/apps/cloud/migrations/0003_auto_20160225_1726.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d2b739e564517d89a8921e32e67f1b8e63b03052 GIT binary patch literal 1305 zcmc&z!EVz)5FOizle9^xK!7-Kw>ZRUs+J2NLfQ%m3X;}|Zm`#fp5Y_- zF#ZH_hM9HTqF&&JZH;GVXJ+Tky!C#JwthbU{vn0U;0f*Ku zNEZqZVy{_yAUjZWA?`xqL+m%!4#*zFec)XXUC0Npbb$Nt72pfN$9Mp|1B;-CXJo(d z2^`eSE{a-Zspf*o%!o3PRkPE_ok|#!sZ|xYAiM!p3cQDOb4Y$F&C zzuV!%zlDz|Tx>%=++xO{D!L}kOd_#P2z5kUw}B_R6xm9>5m%N-JWte08w%kU_88k3 zB$^>a^VwoPJ35XmXK7%w^Rw6Nd~qDH)AvWmZ*5AwM*3QA2Iv7dqWX->@KP5dRN|AC zbrotQ?6_HTaHxzi%xEo1vkF^ZnM4w$*PfP4zpEZnmK~$*vD0bal=YccyeglxTJg@)& literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc b/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc new file mode 100644 index 0000000000000000000000000000000000000000..277d38dde53d6f1d3cdda79dd039830c65bb7904 GIT binary patch literal 1002 zcmc&yO>@&Q5M6)7P12U>3I2jlb>c#~KnLgyH#oQqGvuOiBPDSvOU9Cz_8fj9|AgTT zyX&?YZrspl)^AtR`t80=ejZPMz5ele3HK|(?;D80T_TXUBhUbC1d9kF@?+33v#R%jGuJR1?G{14>5h8zrCYWYvr4qXFs;{-nV>+3l zX`6Ll`^FmQ>0OJrwDS{$A0AE~nLfejJ7OvjC?JCJ2-e6nWUANbZ9f z$OBLrY!5(=L5)F9Ku$p(65c_AdmY1K0@YQ1jQSDDq~?^4N_iEm5y{c IiJvBa00;H&g8%>k literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/migrations/__init__.pyc b/ntt_tool/apps/cloud/migrations/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cc13e061d2ec5c93d8293c39101869007a47e6f7 GIT binary patch literal 185 zcmZ8bK?(vf46Nuu1pl!o^8poK;6?Bn>bC4w+oag^;6MF|csE_dgMpb$h6&01wO+k< z&vS3SHPe1jl!cNr=F~Ok*eRJmDi`%&AZ0GC_I9s#?AhtnOphF& zI5>ZT|HVH+T)4nj)w{D}hY*28;)_ ziNS9~IngMhG@^**nDUrL9ZEYv?od8Qqj^f_AU1k zc}(|nSDQ-#e!~I&0+S_<%f@ulnFM=5QHm%UO^gsC#5U7(M1z1DpE=Piv^2p7vB3wi z;PGYgS($3^c+jkpL3-e`*aW{u$-(Y2cISB*=~pVZ#jzh|ge+ta7ct-Pm3J=ZnM~C9 z+z(yR$UQwCS3P;C7mjsre4Z@e%?yYt#?XzznjBTa`$?8~V3X(B{!o`sGMk5ta2WnN z)Tj2m^4O3<28XIHbI;*7+8T(u>^Ig`b>>RrZ?yfqEp*`}JMw~WwYP`a$j(+gENd%i z>z5Wrqg)|kJvI|j;+Z8*X8&XM_)xh_Do$ZH+MIr3%woZjRLxa<8;WOMFz?(vEC5tO)^_S6Q#GN z8kpE8N)bLB?vlCH6!11z(>|kjzSNHbW<>Fn6%P&tL{kr2Uh%Ny z)PqT}asce3!j*nlGv*Iie&F4M=b~a4F+LJUaS;oDu*mY8?3q0K9JZptN^k*19#zK^;(T>*|&w)$5!rT54fn(R)C5c zYd@6bfoywhC(O%)ThyZ?TPinDV9`@sR-X4$+L7~C3Ej42CR?$~yFuAQXFQ`l!`cI7 z>Qeg*M9Pm$DA=EmZL-NS6S;kb9-+{=8oJ6SyneF91LOQX^X*M6$;(zBW9Y`6D14SW zo6)ss73|A@{8^3eNB08@^IqF592lZ%>Z~E-tDTGm^-AY<5lvf{E;nu_v?ZZYnQ9EW z9rR&nQ5J>smL_cs`V)Rh7la+9p>L61Mcg7LX7o1DfXn&8C%ZSo|8U9&{Iyr zly>>9o)vhg=R2(9AO!K3awN6ht`1Ios17cfsv4?e9LSkIPnfa;^K*ZKbbiocVLJPi zcgV%wjc%eW?#s9tKc6+mN)2jXm*_wfxRJk&!AMWJ*9R+<+0h=ib$g*@3?XtaIPoz@ rp*`eF>>2;FAPgv}On3wD?f#Me`SZ|Cf5`_?@%6V6;nUe!-?{r2V9Ok0 literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/cloud/serializers.pyc b/ntt_tool/apps/cloud/serializers.pyc new file mode 100644 index 0000000000000000000000000000000000000000..73d812914b62cb5ac9282ddaeaefd537b1daa647 GIT binary patch literal 2822 zcmd5;!EVz)5FOizlcp_HfRF+RAx;(t`~!ecxl#_B2#H)QE4!g?9Xs-FfO3Vu;J5e_ z#2MzTleJqoAkj97>dEYmxBK?ZyvYVX_6I+oe}6lr)hFQZm;C5&Y$X4AloQQ8nt0@4 z>{IU3SO%m#Itggzk?hb{qAx`6CLNO9Rv>hNF3Dai(0755_x)7noI*rFr&QRl1%;aQ`U#%bFUBO zlNd$d#dO#lDU-V8*uXBoa8&?fK-Gq7&e%! zch$haHvnijp>OW-m!)l7rL$Q!eVu9Zzja{G^=A#BB9$$nx&}D=JVOyEYDh7AJZvKp zeZ0g^%Um@}NDScCENxBlpb5~kPToWI&rzjJm8lQvaubM3ImE80m39IpCzCr`K$9+{ zj67zx*#PIXQY$?R1gy}lsGGn=jayAL>Ojk~$+wD@YGIDW4*nHCEpr{UfcB*U4^rM9 zF{2i40oqE;ciC^(!{ye2Yv%tZWa09+frLG9tZa>V@iPkrt&;_a?PQHrkro^7y|@30 zNpGqJKX!C&O%@Lr(jy1Ue-oi287QJs+9b1zFDD<%>QwLy8MF+0718#Vb%a|d+;Ml1rP`v7`7x#lXa0s;?}yK23Ww$M{lv$-v&nc1kN~BCl>lL}2hxMmhn3%AA7lp>=)<-P z9{{T!U=Ox^$U1-n`0zj+a2N36Kjy@t!)vY@0rKX;G2Ai8`Va*JR#5!#3Iuy(l{K|& zL7zdb8^YSOgiX1nF56V)IA-To;Cgy2NKIZpn2K5?yoD z5sOyik-s_P7fz}|Bk|oO*5)6b(2-gw;EXV_wDxe4<0aArSja8x0%hpCawk5B2#m*?k zl=GDQ0#*DEzrdeRJi|G?l2#_S0?M(y?dh4G*_r9nr+X`ZtTzAr^!J;6HT|jJ|L1tz zZxAv5v`Um3Y1Pw8Qx8NBR4*v>is%*9s}%Z@N|w~9s(RHzud1Y`Ms?Mz7kW)4%WBk6 zy+)zeRnk;lu8h_STFc66HEgL}t>T8dr_^1ge(0^LxVbQ}G9Oq|acf~w+HsnS?|i8J)7Em(4Y3yVB>t`CsUnEeB&-p{Ju^7pdWb~ms5>( z<1BTy=y@Kd*LQAge{XMfvjdwhOd4cqVZ(h~^exCMNj8aZVmCY1&pp85FYveygjKwF z8>nGL4VQQoxK~@_ZQ5nE2e&koZAxQBnVmMKs5Y0DgN9)mjcgeDCVIkfl*N;TY89%y z+t<;`ZVheUJ6}ONN)nm*_jwq<cX!Z#s6#%2 z;iDY_%oYw|V}Uf6tdbsa3$=Oq z(&cQjYc^+ElFWjp0i8|BrAD{(ZP2+8-aT3q~iy zRl-C->I)VN5wP@Y5xr%nc^aJ(!2*9nfS6|~h_n01aC+?ptmqT-0>z6IFHxMQc$wk? z#XQQ)D^wX_=2eQ3ti;Hg|>Bc@c%L#Oqwi zyhHIW&FQ}hcuwZ^a~t_AF992eL^J_my^y$8(R$lG;A zFc3Xj(;5J(6D}Gt&vBvy)h?^BZ7Fxff#WFmsM^HcQp)Agz}e9L)VE{Lf>a*A^tA*c?Elz@&x=0FSqo0y`fjNd`T>1TZtpyUzu&q zC903itL6imT!tuNe99S?%adsxE2uKVHd>9=cAMcS-a^6T!`&R;3x`>LV9>1$Yt|xa z$^0iRw#qtwTHKRP{$Vq#!o>NW8R4WsI6U-QCqEd94+%yTK38nw3RatcZ8-UG`j$h} oQb4MDDI*L|`lPN^aQaE{N%a{o$}zES04lTJrfycw)z6*%8&>gQOaK4? literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/core/__init__.pyc b/ntt_tool/apps/core/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d4be7bfefce6700f3ef5c875a0890980ed749d3e GIT binary patch literal 173 zcmZSn%**xF_DWbX0~9aG?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=Pb?@X)=$naO4W~# f&&xasIaM;O8vJU((B0WGr0)9v}#41Oy3<1i@JezJQ>hQ6QWITYyurTfi&T z6j%aMZ0OSx>=JIvJtFHr>6DTX?voh|q8nqzf`V!ErQpf|nd@lX^SXCWnVauUQIU%# zIAn1>S8rxUTv2RyCT>#IrFdTvO|B^i^-RX?kIYlgQ(1(`EobnEFm?ZmC@F-0Gn43T z3QkA&ko=T&imvl%vhDXg9TBm`lsuyuw8IN-Q~Zmy8HTL8G&;??Dk}5dXCc|iy9-vB Jd9xF-QeS~zTwDME literal 0 HcmV?d00001 diff --git a/ntt_tool/apps/core/views.pyc b/ntt_tool/apps/core/views.pyc new file mode 100644 index 0000000000000000000000000000000000000000..72d19a0f0aa9155aeedd57f0771ef2d91fe60d25 GIT binary patch literal 776 zcmcgp%}&EG40hUWz$B!Bc!-|XI|78baT!u4O=6d*wB8SElTo`2&f^hz6T}(p46!GG zsQ&WVuAR?G{Bhj>ynLS&@Uvpsuf^zGpp?%*1yCE98ZhcdP(@J3Fpb5J0b`gMC_C^5 zum!lEcA)ISIO$3G@=I1?gz>3BgRaEJvbPP=+B?Est|Ph05;uG#JlpnhvajmAf${U36|;ezWb6lM~EL@QZ=u$u9K zkOrSxBo4v6nG@?ctBuk`7zCiPuyo;TOdYO#)l%vm7L{*HTR!G)?o-FiGO(|d1!C8) zyzuVVPxJMf(!w{GKFicJl)S#d9D@*2x$RyR$1job=TP HW)Ob^kN>^L literal 0 HcmV?d00001 diff --git a/ntt_tool/settings.py b/ntt_tool/settings.py index a4facaf..4d0d045 100644 --- a/ntt_tool/settings.py +++ b/ntt_tool/settings.py @@ -82,7 +82,7 @@ 'ENGINE': 'django.db.backends.mysql', 'NAME': 'ntt', 'USER': 'root', - 'PASSWORD': 'root', + 'PASSWORD': 'onecloud', 'HOST': 'localhost', 'PORT': '3306', } diff --git a/ntt_tool/settings.pyc b/ntt_tool/settings.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3ee8d9d8e513f78e9b2a2bec1da459ced59fa682 GIT binary patch literal 3451 zcmb6b*>=-L^x96G#1Qr!3Z_5_fyjhFSjwi@N-%gkmO`i=(2+e8TaFf^88r>B^b`9d zJ^g_8&PcKy5)Q@7%$>RWD&_u}FPtp@^}Y+qXAbw*_-B7-00@AIYX(Rb+zglq#BdhO zEYJ)Laxj=W089hT!Jdg{pn%Hy#C`!BtU$R0C zxr7K5d>K|9JY50u6OgMwu0anOi?B+r!>TX`HT(?bDL^U*jk*EkCL(VE`31MzKo)Sj z17s1myFl*Ywgg1Mtpuy)X~9PBOJV^nkDv!5XhlM()kGg2f_WCmBQVd&pq!WM1-V`X zvI^#S)g0qt_7P}rb84Q)X$-QkRvd$^+zHN1E2S2fV)49Bi`$Xw7F~z&Vz52- z$o2^;qE1-+-F73&eneMDw)HK}pRT(cqYaDf46d9vBJ|k33C25P z#tAyC887gavfRE;&BAS^jLUn6?oLoY9?MRRvN11{2B~<)d^lZM*b}@jzt5XE^Gy+l z#3W7OqzUyntrNOe$GW{yh%q%zcV}RCcd$#959=bg&7o*VHo-cNtfP!Zq03llER0ic z=;9<$Iw*zuB<)ls?s+3YGd_bnYijwO)~GO1I;q4`DuMASyslK+I-f;AZM7_MU<-Ii zS|lZvy+Z%s7S4k%x*CM2mUf~ZTl{~-A^n7{&)MBE`Mzw*mfA00WSOlTq#uR<5S|n# zd*vWr#-!OYs?CPZE~4l(Cdw}BIih(mJ+g?{g|TAN8OPe&W1n1}N2J!+s5Ug7i>1g= zHq^Q%fiMWT1U7Z8ErT2QRCc92v{YT+YPKs}yal*H*LM2>iy7WDbwhHltlVFfK&#m{ zq}_yW+mXxJo3Um4LO8S;!#P1L9J3CQUMQQ4hAJ0RF5*;oJjb;~^S_TNFpJ;nki&%4 z9pCXHuSWeI?~g^i`T=|5S9m{zA12P(sM?T%d%DnO)J=)yG(T)*d_fCk%8Njbj$X7RwH(JA}mQ_)%sSc-rB>V_2Efwoe zH8gAOH(4jd-eX)m-QI2)miD1lZO4oit!AkFWP(s@wdR)9*4Epa{)S&kZjDzy)7-jA!)34I)D61F=`-V18W63;c1AP#G)u8CPA z4|TQLkO$$Ku9e%GVZGC0r;IS7T;#Q)t!-{_F&L!>TE!BbqRYo*wV@k$i+4D}blLj# zYNb-sw$!$k296&^-gdKTSexxyx!G8kW)A|#mtAOR^;Qj|sq+&^x211Xg|J!@eMwSL z4OJMfb1@r4daSgOt@moJiufjuQek6FZES3+8>qZl(PH`4x@MV892mlX91B);`AK7R zs4d@b$f+VQhRJ0p3`}5Im@92UAMv li > a { + color: #e9e9df; +} +.navbar-default .navbar-nav > li > a:hover, +.navbar-default .navbar-nav > li > a:focus { + color: #fff; + background-color: transparent; +} + .navbar-header a { text-transform: uppercase; font-size: 14px; font-weight: 400; } +/* Headings */ + +.form_h2{ + color: #0E3D59; +} + +/* buttons */ + +/* table headings */ +th{ + color: #0E3D59; +} + +td > a{ + color: #555; +} + +.panel{ + border: 1px solid #fbfbfb; +} +.panel-info > .panel-heading{ + background-color: #ededed; + border: 1px solid #fbfbfb; +} + +.btn-primary{ + background-color: #0E3D59; + border: none; +} + .page-header { background: #f6f6f6; border-color: #e9e9e9; diff --git a/ntt_tool/urls.pyc b/ntt_tool/urls.pyc new file mode 100644 index 0000000000000000000000000000000000000000..95b0b255742550d4a68e8719ca0421b89a25eb72 GIT binary patch literal 1556 zcma)6O>f&q5FP5nwkUta0g?c{>>+?8z#);|Dl|m`BS8!l4WPI^=wOB>R}y9JF0nhT zn_lx5d+fg`a&BjqWbGsf5DHxF4ByPYc{{uPe-6Tr&;I%?gZ2sO|2e(xZyIudC5-{( zJtzZEJy`Z2V7m`xAJhPr15iU)4jbiB8&LyV>>G8Z#ArsZ86zWgIql*`S-SGCTVU9+rD`ZN+R@?4}^ z6sj^7=R&NkQ9`{>(yD5mckti0cwaIVaHm2FC2MLYmyai>ZDkvyrg5qeFzJpXUz!x2&H5>7Lnea7irXJwridQC$36}h~O zHnh{|+>0ZK3~do(<#Z-it(@~lvSv$YFZ3#6e#hx^FSz7|SCz~D{BzW(xnPw&?OOoa;%YHqKXd=IXqLC> z=LKtn408oaKjGFvzD(a_Vd0on%j%e;4(6AF62M_3_U;iXH L3HF0W!FR!b;s>#7 literal 0 HcmV?d00001 diff --git a/ntt_tool/wsgi.pyc b/ntt_tool/wsgi.pyc new file mode 100644 index 0000000000000000000000000000000000000000..aa2bea456337b81ae7d4b35fe84f7c06cdb01004 GIT binary patch literal 622 zcmYjO!EO^V5OsFj6fGbXfjIk^1FXdn1PD;u5Co}23P`y)WX~m@kCY_madjd>|`L)gy?14;TkF` zi(*0&zO@)3N?L*JGmQ7k`5b^(cj$z7C7=i!lz0L6-^jn9;_SjEz=O{no&Q-zI!pq`XZ)e0{Nm4(*h zWdniKMXa4F+;3jf(STc|2MjfkP7!@W3_aw)(Yx2v@u{92pPfyn!&Cq5V=st(Lth1pf#(~nliRA(jjlX!m{GV%2eqi`})fewywiK1v{9^!qRL!(QQ87 zP%}#R|3iGsNA9ix72q8GCMpb2dE8jtmr|^+pH;GUL(}agtuXvM?;fLM=Pf3C-cRXe PvSWf_b|*W`?q`1h41=?5 literal 0 HcmV?d00001 From 37071df18095ae382401d4e4fad29858333d9861 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Mon, 29 Feb 2016 18:57:46 +0530 Subject: [PATCH 03/57] UI Changes --- ntt_tool/__init__.pyc | Bin 160 -> 167 bytes ntt_tool/apps/__init__.pyc | Bin 165 -> 172 bytes ntt_tool/apps/cloud/__init__.pyc | Bin 171 -> 178 bytes ntt_tool/apps/cloud/admin.pyc | Bin 228 -> 235 bytes .../apps/cloud/migrations/0001_initial.pyc | Bin 3014 -> 3028 bytes .../migrations/0002_auto_20160225_1631.pyc | Bin 841 -> 855 bytes .../migrations/0003_auto_20160225_1726.pyc | Bin 1299 -> 1313 bytes .../migrations/0004_auto_20160226_1322.pyc | Bin 996 -> 1010 bytes ntt_tool/apps/cloud/migrations/__init__.pyc | Bin 182 -> 189 bytes ntt_tool/apps/cloud/models.pyc | Bin 3470 -> 3519 bytes ntt_tool/apps/cloud/serializers.pyc | Bin 2751 -> 2828 bytes ntt_tool/apps/cloud/urls.pyc | Bin 1000 -> 1007 bytes ntt_tool/apps/cloud/views.pyc | Bin 5075 -> 5166 bytes ntt_tool/apps/core/__init__.pyc | Bin 170 -> 177 bytes ntt_tool/apps/core/urls.pyc | Bin 388 -> 395 bytes ntt_tool/apps/core/views.pyc | Bin 767 -> 788 bytes ntt_tool/settings.py | 2 +- ntt_tool/settings.pyc | Bin 3555 -> 3575 bytes ntt_tool/static/css/custom.css | 58 +++++++++++++++++- ntt_tool/static/images/logo.png | Bin 0 -> 4462 bytes ntt_tool/static/partials/cloud/cloud.html | 10 +-- .../static/partials/cloud/cloud_view.html | 2 +- .../partials/cloud/cloudtraffic_form.html | 24 +++++--- ntt_tool/static/partials/common/header.html | 2 +- ntt_tool/static/partials/index.html | 9 +-- ntt_tool/urls.pyc | Bin 1553 -> 1560 bytes ntt_tool/wsgi.pyc | Bin 619 -> 626 bytes 27 files changed, 83 insertions(+), 24 deletions(-) create mode 100644 ntt_tool/static/images/logo.png diff --git a/ntt_tool/__init__.pyc b/ntt_tool/__init__.pyc index e76aa3253da680688e1dbe1c5b30654fd8b6a3c4..6f5bd12c5fa31acbc30a33f16093f055057690b3 100644 GIT binary patch delta 82 zcmZ3$xSWxl`7}D383=9nV8Tq-X`iV&?r8)WqMfq8&$tA`5`FW|yIr*h2 X`gtWK@g@2BIq^lQ1^IB^#2Re?r}`S$ diff --git a/ntt_tool/apps/__init__.pyc b/ntt_tool/apps/__init__.pyc index 8480845171e590291d74f002cf9583be86f327f4..8b68333485d8cf6911053b6d194b5670b4c833c0 100644 GIT binary patch delta 82 zcmZ3=xQ3CP`7u85kJ!GxBp&_487*^K(jz_4D&mlXLP*Q{q#y67$mY i_47(f;`36=;}eroN^`)xlKlLf_=3ukjQqTbrDgz{$sTF| delta 75 zcmdnQxSElj`7}D1r3=9nV8Tq-X`iV&?r8)WqMfq8&$tA`5`FW|yIr*h2 X`gtWK@g@2BIq^lQ1^IB^#2PaIoJktA diff --git a/ntt_tool/apps/cloud/admin.pyc b/ntt_tool/apps/cloud/admin.pyc index 1f4e0e0926375ddd144fe4df94fe9cc4f18e5e67..7c93bfd7cb0b9391a7d62e3ae7ac892967b00931 100644 GIT binary patch delta 82 zcmaFD_?nTO`7z delta 75 zcmaFO_=J(2`7_rxV3=9nV8Tq-X`iV&?r8)WqMfq8&$tA`5`FW|yIr*h2 X`gtWK@g@2BIq^lQ1^IB^#2v-}%S{`Y diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.pyc b/ntt_tool/apps/cloud/migrations/0001_initial.pyc index 30cab74951c4d73fd02fa31cd3148df322029360..8bc6879ca50504b61d1e41d997011ea3867bac8c 100644 GIT binary patch delta 157 zcmX>menp&}`7**|jHXE87^=x5~Trt0UVX6NUW7VGEdr6%X(m!`z0WF_XM w=j-Q{l*H$ymd7V1rIhA?c_sPzIq?ORB^mj7n+>=G87VbnvH_R=>oKTk{K8n^fU5vQ}q**Qc8353ySiyQj<%H_4D&mlXLP* hQ}pvnO5#iM^K;^hQVa6oyv^oZf{bMAp4`su3jl2KGJ*gA diff --git a/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc b/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc index 6512d1e91f73b7dc6b1704cfe789085a2febbf3e..f08eb573447d7c5904e48a66c0493909f925e882 100644 GIT binary patch delta 156 zcmX@fcAbr#`7**>jlfOBom#^fU5vQ}y#wv-5LGi}myKQj>G?OH<-gvJ&&s q^Y!yeO5*cU%i|N1Qc82cypsI^aO9c?=8;`WgATsrrdYDWy631x5K;smUe9`uTaO$vOF@ hDf)ROCGjQs`8n}LsRj9P-sF=kR+HZ_&!fbE2mt+BG^qdp diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc b/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc index f814b293a23ff0b298be232606b8e44fd7166732..6bcb6b74497f25e37c9d25524bb72001ef0b8e3b 100644 GIT binary patch delta 156 zcmaFD{)wHP`7*{hiBOBom#^fU5vQ}y#wv-5LGi}myKQj>G?OH<-gvJ&&s s^Y!yeO5*cU%i|N1Qc82cypsI{Uz_c?=8;`WgATsrrdYDWy631x5K;smUe9`uTaO$vOF@ hDf)ROCGjQs`8n}LsRj9P-sA&J^C{76HTed!6aaU6HADaa diff --git a/ntt_tool/apps/cloud/migrations/__init__.pyc b/ntt_tool/apps/cloud/migrations/__init__.pyc index 21f91f53e780458cca5a69c321ebfa69a3fbe5ca..8f902f0832611bb9a21685d4a79f25e23b131b21 100644 GIT binary patch delta 82 zcmdnSxR;Tg`7}D463=9nV8Tq-X`iV&?r8)WqMfq8&$tA`5`FW|yIr*h2 X`gtWK@g@2BIq^lQ1^IB^#2QBcr8yel diff --git a/ntt_tool/apps/cloud/models.pyc b/ntt_tool/apps/cloud/models.pyc index 78d2321b47d929c1eeb17682cfc19b8c4a1c8e3c..59db54d0c62c84eb12e84b62b3bf7d2bb9c6b3a3 100644 GIT binary patch delta 519 zcmeB^-Y?D0{F#?4LF~##_DClCNCpN5{fzwFRQasaQ~z@3OS$=Z`=QT#M aT@UvD2JZRf8vt~|p*A4*rgRQCn diff --git a/ntt_tool/apps/cloud/serializers.pyc b/ntt_tool/apps/cloud/serializers.pyc index a4d098f95bf301faee7a8e3d48177af81c7ca532..f0f4e06f2c402c572890b3d5b07d7a786f76c12e 100644 GIT binary patch literal 2828 zcmd5;&2G~`5FXo!lco(6At412h?~U$AGjif%9V21L`dX-WwIOM*0C+`no_Rt7Q6;8 z!n5!IFyA^jZp8sag=5E?ot+);H@_b5`*`&A@wZnC+FTz0KjTM#;X(4xp_FLt(A*&h zv`eW=GwG3X=)|L?L$XJoi9Qj%p7%)hTMWNp^hpj{jA6s@N$#~6qlPgcx!+jq1 zF-?POj4%1YSK#o>>;tnZlQ>O2s#4dB;5;Jcm7F&G3+f(0^bQY-pk=Kj>-|e9 zm&7!HT}+RMV`bt-90yo&psB@`OLGqryg~sa%#epD%Hp+(A~UkYI+s-nvd^RiXJ@>u z(pr+&$k~dzXiqF;S+@qWCSp)lw$U)2KK%t2}Gy zFfIxmTEVbosz=4SfOZ3Zw9A9<)CjOBpnw2KyQc$aK!o#aXs)@FQL5M|8RePH)vAyiGQj)v#VwX>ZSi@_HZ;T@NQ8sU zZm9~hG9cB5MOsPKQIOnZ1R6+v2X~EPH?kepy#aWeK)J>9cA#8sfc#PU{+&BJavVNV zJDA=0z)l)yuDN^3X)~3@S;s{hG2afP8k6p_RzGM=wo@s1$gu7=(A<{+ikLxzQz~tu zWyyWaSzewBULk`rV!IY?`>bO$Fxw;*NMnKOFOb;+ks@%w|4$&>g*~bJuBS+RjqmoM MGx8=r-@}Rj6WVf>`v3p{ literal 2751 zcmd5;&2G~`5FXo!NqO-zxef2OUMwDtwZA9mTL!3`p*G6bG#$ zAUUE*c!Tj}Klu|nJTv>itm-VuvyZCQ%_209%}pMk<>gXNTKy$=PhfhF2SxC*agzQ1 z?UYMm5+W|9$HS>INo$S+tU1s$=E|j+2Mb=I5EdrjA&!e=q2kyKt*|KNGKbh_(Soxx zURHTy$?Ifi`W4TjvvQ%LU(M+#2wsT^@X=IU0)s$OX{ZJ)6V?C^)#mrkJf=HlBx(t*|W^P9w z&H7*?$~m*00t8HJl^7-CvaozyR&phV_&t4jixoRteBQDy2C)Yb1z;I0Rb|c$M0Jto zOQ|+p7Pt9m4T!#jZ*%;X8I5?}0WlH)wXqcpkQx+!rBQlfl)bR@%h#nr|TQ%lfV0 z6*A}%_P(L*4e1nDk2Mhms4CFY1=uT48v+MxkR+2fh*!xG?OH<-gvJ&&s k^Y!yeO5*cU%i|N1Qc82cypsI diff --git a/ntt_tool/apps/cloud/views.pyc b/ntt_tool/apps/cloud/views.pyc index 5490e557b25ee83a295220b81fa4b48ea94d8d31..6e8d6ac839dc4d483883e36c777ca4825f8bde2f 100644 GIT binary patch delta 953 zcmcbtzD|Rk`7*}0kRBN!MM^fU5vQ}y#wv-5LGi}myKQj>G?OH<-gvJ&&s z^Y!yeO5*cU%i|N1Qc82cypsI zvP@JkNOrO?#{?>vBe(e{hcY!nNN#cwS1wf?WXdf~oe)~en?Vf+O-|;!L=|(o`7cw& XoGk)ZC^cvE0l_Y6#JcR{`NAdu+`MOM delta 866 zcmZ3daao<6`7vH+c?ME@e(g3PlENHWJFA MC^BUy{}MI<0LoT5Pyhe` diff --git a/ntt_tool/apps/core/__init__.pyc b/ntt_tool/apps/core/__init__.pyc index 769be916623ccfca40aaa8050b17860c104c8907..ecfb35f818dde7fc71ab9331c9496e73e27318e0 100644 GIT binary patch delta 82 zcmZ3*xRH^a`7u7#JAzGxBp&_487*^K(jz_4D&mlXLP*Q{q#y67$mY i_47(f;`36=;}eroN^`)xlKlLf_=3ukjQqTbrKSLx}D3h3=9nV8Tq-X`iV&?r8)WqMfq8&$tA`5`FW|yIr*h2 X`gtWK@g@2BIq^lQ1^IB^#2QlokpLQp diff --git a/ntt_tool/apps/core/urls.pyc b/ntt_tool/apps/core/urls.pyc index 48b070e80f24fda915d107648a18335eb3f89357..4a082738e7092953f3c918e7704c13e8053237da 100644 GIT binary patch delta 84 zcmZo+?q+6Z{>;m@#rWbzb^%8FFa`z&{fzwFRQvOl9K0HYoq@&Et; delta 77 zcmeBXZeeC;{>;l|taD-`y8xqwKLZ1Uenx(7s(xZpN@6Nqk9ueolN*YC%4nH#v;a6ac0i8c6^E diff --git a/ntt_tool/apps/core/views.pyc b/ntt_tool/apps/core/views.pyc index 30bff5c3849917d97eb61cfa133958badb842559..1571661da29fd94c024b30d43def1924b639af10 100644 GIT binary patch delta 228 zcmey*I)#m$`7+07X3!xG?OH<-gvJ&&s z^Y!yeO5*cU%i|N1Qc82cypsI}HG>0SpWb`WgATsrrdYDWy631x5K;smUe9`uTaO$vOF@ pDf)ROCGjQs`8n}LsRj9P-ed(PnaML4Jt;Auo)XP6lYcQu0RUJ1N+AFM diff --git a/ntt_tool/settings.py b/ntt_tool/settings.py index b0709d8..5144bb1 100644 --- a/ntt_tool/settings.py +++ b/ntt_tool/settings.py @@ -82,7 +82,7 @@ 'ENGINE': 'django.db.backends.mysql', 'NAME': 'ntt', 'USER': 'root', - 'PASSWORD': 'root', + 'PASSWORD': 'onecloud', 'HOST': 'localhost', 'PORT': '3306', } diff --git a/ntt_tool/settings.pyc b/ntt_tool/settings.pyc index cd44a0d7719871d2783ae3decce679f96fad1f16..a88f971fc5cda5c2023229631e4c3a6d92c8fd6a 100644 GIT binary patch delta 309 zcmXv{%}T>S7@SQiDTRXIPt|CTqShM0y8c`L9zgIQ>?KrZNgHEUFhM+d=p*z=Bv0Zq z_yU5USGU1lX1Z?cm2F_jgkKXbJ^ r0P@+kjC_1zKariTjZGu%N!vD!#P%uMX li > a { + color: #e9e9df; +} +.navbar-default .navbar-nav > li > a:hover, +.navbar-default .navbar-nav > li > a:focus { + color: #fff; + background-color: transparent; +} + .navbar-header a { text-transform: uppercase; font-size: 14px; font-weight: 400; } +/* Headings */ + +.form_h2{ + color: #0E3D59; +} + +/* buttons */ + +/* table headings */ +th{ + color: #0E3D59; +} + +td > a{ + color: #555; +} + +.panel{ + border: 1px solid #fbfbfb; +} +.panel-info > .panel-heading{ + background-color: #ededed; + border: 1px solid #fbfbfb; +} + +.btn-primary{ + background-color: #0E3D59; + border: none; +} + .page-header { background: #f6f6f6; border-color: #e9e9e9; diff --git a/ntt_tool/static/images/logo.png b/ntt_tool/static/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3fd811a8df9195cd54d36ba60ff79b17f3d8a0c7 GIT binary patch literal 4462 zcmV-!5s~hRP)604+w@`%n>kz<;sFNHUtRE5zZtK2-jj0ve_&F%ne>J*o^^WgsthGv5CRv zu)&({mp`gyMm=L`G&7QAnBVu!Crwp#y=pyGcOCD&5>;iW;fag|{sFLow)oTi`v@Qh zECd$BKf8Zl0KDlA#hY3~$WZuOcp@o`LJy8Ve^*6y?*VrKce$z^)wgc#W{oP?6Zr;k z4sZ~#VU4R-;3?n^;6YdQ(;C;mRD%Kz<22V$?zNC-@XdHc~BJWiA)Br0#d6f5&*x%DD|xx z$lDY+1~?x0=4y(4C3^FKD%cZg0{#p0hc3lOz!ktRT-D_RAm0MM4_wUZN9H#Gr+rzc zRs*JBPh=y^qjt{{*39DxT-C`{)Sm(xUDeMjtz)1V z5CwZ88vxG(TbIaQ2pr_9zE*R=ec*{~3ETthSR(rpSM|a^u5Sl+2gb#pH1Ks`13)lO zq%3A3CJW34rn#zfYIP6&rREBbAB&Fy`3lP z5m*Rm&J#Jk7BZ?;@WF}i zUBHl=@Aikmw)}8ae+^t&BI{yLWaDb^8eO`QS%UF3h;+S+WNo+)mB_h z5B@f=ULx(ktElfQi>n%8_OFvWYbSdmTU1kbH408Xo)!2~Z=Me%uIe)2KN87}z$Mkx zTk$B`6Ukugp}Kj&Ro$(c#(dR@Uwdx>qYIKh12(R7HL#){?1^kbPvrtUQb}EPz98Od zyEu`&4yCtV%c9apbX$qELEpgtlJWqMT$4Vu(#mS7;F_+XepQJd#ZM%X4~QS%{ic=* z&Q@4gonn&9yz66Zzxz$C6r87ch+n62{clpr2WFG(aPXDww>se+T&RlR0fr-EXM5Y3- zV!ZHI$EM{9ty2}_fR{ayYhriYUg=fAp2!Zs8yGMAQf4F(@CfCNi zD%ca*5O@w_1eWAcV3Mo4u+m1?=|8dk+quBMQ*6Wa9m|NJro>IbsnU6Gauk0S2eknRc8(0i5v{vi`hynKLFspUGb(g6fF*d;8)#gj^i9JB8{0$=B8e*+f7wR`o4c(xw86$ZQDNp4i19gd!_On$GKcY zie5|keE!s2E?1TVw{6>dipXuMdaj5p4uar0+qMJXQdND&vaFe^nv0^y&StakS9eF? ziR_B;z9^gxEd@rpsvnccIF@4N&ghSF0aSHs5xFs)P9Ip1wwbDK-p6&{Qq^zwM^-Hf z!|)d1bX9#wRX4&+Lr%y1)0c&1S^ER`1VQkS@B7cB)9GfL*GqM%~tx0P^{s@^hkH$FzoS^Z5F_+7A#Cd5| zU6ILTW_6c$9Oqn2(6;q~OQI-x)UvEU1H)DIO%eH_@B5vq`ZeHS$8in;{-ml;h{zU> zY+?dtBq zM*vCl%=@bF%Xt;}X&8q0?X=TQJr+n(sno?l6a>K*s`^9}MVA$1Pj6~!8ozSo${$;n zH9KxNt*xy)0=so}b#=^)R3;?ePf?(68rlwW? zzv*;(Z{WgwK7X#3KO5LXRWFR|x;2-}WrhtKHrDt3HWBeC=m@HMLsL`Jc)qZ$n$^_Q zG`^*!rF;E;yD$tb$8koA$b+hSNe~2^Ha9ml4WiX70S|5q(agz)Ik} zN(6S}`~K}BGB*f$=wR<;xGZZTnKpy8P&Zaw|GII+psrzdUY3zN4dK>HPWg zmlf8hsuO_MgCKZFRl|;sj-~x+PlC%SUhz8H6A>$Rn@lcV-%^W6tt(cnm?R?Kw=8Ri zg5(z9QxVCE$N~|Wv~1b3MnEmgS~Y=JV?Z!HpU)p8BKupGHCa{niK1vf5t%V(&YYDZ zvW~`s2>=oKgyIMTg)E8799_+QefZ&rR|7{`mi0Qu54zuhS>%gBZPmmP`;xPtt$}SU zVAm4YJX{OGOO`D8D2k#U1eBC^@?<;xeP z)9Kl^ZFj#P9|1OZ9A~a=+y4&`1i=hdZ4r^*#bxdWHVuN{k8#~ksp_wyD4G{VQ75oY zb93{hy|pKo%Po%Qsn(^m|Ql8DH4B65vw+b^o>6Z^|9yp~R< zpRA-U-NeCMl9sKz$sDsAv`0bWlkOUvuGFa<&vb-;DoC1XQEXr34_=e%)R?61MwC); zO(x-W`bRv5sFtMeMl@hnJ_@N>0FX6FI-Nc)ilSBbmP)0b>+I}&sgG;6T(M$BZpo4* zAH_?jTl>C$d$}@g+uo6a;Hx6?QMuQLVffgXF=Hmon>VkTP)bSNt#1L#5{VmBAz;WL zB6CHgLqv{DrBbt^D9Qmijx$UO3fu z=@>KE#vlj|wQYMF;8qb?6h+b8APCM(r_)ciw6yG3O%L`&t_A+JAZfNmvHfjpr2>XJ zB65bR-Yz2lqvoG@OUtr82*dD_Y&QEIKomvi2SKoE`7{i}M&R*GCUcUAypv9+zX?oH z)sy42k4woa;CNNN!}tBeL}b3>I1_+#RQ04xCNoh)cBg6v zQmO7&<1$t4(>k(D+{E{61IB8y5E~QHuciUOh6wkH$OKiLkxHfBZEI^A7q5rUSJmNB z6ups3rA~Al=XrW@ri-HJnp7%vr{g&9(8nPoQ54-LBDdPMZHveO4Gj&~hGCeGqUbu? zwr7Y)OArKa*|z=eXPGCL$dT4Gl9z_K;2*;<{268p(}O6AE*L(1_!5BFSm1k>WzB17X!y>81q(jRWHR?hQFIpY z%7_so4p3DM!|*g!eW!}sEv2*RqN;cz?*N4x^7DYL>K=ooNvG2XsOk@a_rox}sa%VX zfy5J;NzbDS=DVs}be}CW4JbU6VhrZAl73lpd{xL~GJl{ruGJdD6FHFLb10_47yH5Y zmbmWHO2Y=!89ZWVw989m-3zgTUDcN;eix6X=bWm}(BwzJ*hJd&Sf@R#D#v0X zk*QTl2k_Vr>8cW0O_*~H=6WJWR?*%%{lGKk!LuxtTVf=?Gp2**0ygUyDwp&fHF5uMO90U6dC+vxQ3lku-uOKT~%o3-MvF@u! zzUv=f$9N<-7%!8);$poI9MRVlwyb#3o=6&VsMFC@cKT+W+R=Sb*Ez0grmw>N3J4xg ztgpm4j@21_9tVEns=iY01r5)8+*s8Add Cloud
- +
- +
- +
- +
- +
Cancel diff --git a/ntt_tool/static/partials/cloud/cloud_view.html b/ntt_tool/static/partials/cloud/cloud_view.html index 6d20435..b20c8c8 100644 --- a/ntt_tool/static/partials/cloud/cloud_view.html +++ b/ntt_tool/static/partials/cloud/cloud_view.html @@ -25,7 +25,7 @@
- + Add Traffic

Cloud Traffic

diff --git a/ntt_tool/static/partials/cloud/cloudtraffic_form.html b/ntt_tool/static/partials/cloud/cloudtraffic_form.html index 9de0815..25f568d 100644 --- a/ntt_tool/static/partials/cloud/cloudtraffic_form.html +++ b/ntt_tool/static/partials/cloud/cloudtraffic_form.html @@ -1,49 +1,53 @@
+

Add Cloud Traffic

Cloud > Traffic

- - + * +
- +
- +
- +
- +
- +
- +
+ +
- +
- +
Cancel diff --git a/ntt_tool/static/partials/common/header.html b/ntt_tool/static/partials/common/header.html index bea21b8..9df8987 100644 --- a/ntt_tool/static/partials/common/header.html +++ b/ntt_tool/static/partials/common/header.html @@ -2,7 +2,7 @@
-
From 66c08a28981d03a3609456404101d1e834b826b3 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Tue, 1 Mar 2016 11:04:13 +0530 Subject: [PATCH 07/57] test --- ntt_tool/__init__.pyc | Bin 167 -> 163 bytes ntt_tool/apps/__init__.pyc | Bin 172 -> 168 bytes ntt_tool/apps/cloud/__init__.pyc | Bin 178 -> 174 bytes ntt_tool/apps/cloud/admin.pyc | Bin 235 -> 231 bytes .../apps/cloud/migrations/0001_initial.pyc | Bin 3028 -> 3020 bytes .../migrations/0002_auto_20160225_1631.pyc | Bin 855 -> 847 bytes .../migrations/0003_auto_20160225_1726.pyc | Bin 1313 -> 1305 bytes .../migrations/0004_auto_20160226_1322.pyc | Bin 1010 -> 1002 bytes ntt_tool/apps/cloud/migrations/__init__.pyc | Bin 189 -> 185 bytes ntt_tool/apps/cloud/models.pyc | Bin 3519 -> 3491 bytes ntt_tool/apps/cloud/serializers.pyc | Bin 2828 -> 2822 bytes ntt_tool/apps/cloud/urls.pyc | Bin 1007 -> 601 bytes ntt_tool/apps/cloud/views.pyc | Bin 5166 -> 3940 bytes ntt_tool/apps/core/__init__.pyc | Bin 177 -> 173 bytes ntt_tool/apps/core/urls.pyc | Bin 395 -> 391 bytes ntt_tool/apps/core/views.pyc | Bin 788 -> 776 bytes ntt_tool/ntt.sql | 408 ++++++++++++++++++ ntt_tool/settings.pyc | Bin 3575 -> 3451 bytes ntt_tool/urls.pyc | Bin 1560 -> 1556 bytes ntt_tool/wsgi.pyc | Bin 626 -> 622 bytes 20 files changed, 408 insertions(+) create mode 100644 ntt_tool/ntt.sql diff --git a/ntt_tool/__init__.pyc b/ntt_tool/__init__.pyc index 6f5bd12c5fa31acbc30a33f16093f055057690b3..7eac2efb07fef4df13ea90d8381a4ec497e27838 100644 GIT binary patch delta 29 lcmZ3^xR{Zh`7yX`7CRV9%#^jenp&}`7**|hJW=;Odslpkbms%d5n3PgFIgi_6auU}gEaGthv*8wo diff --git a/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc b/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc index f08eb573447d7c5904e48a66c0493909f925e882..754b84cc4c664b3f177f52a62118a35f30648f9b 100644 GIT binary patch delta 52 vcmcc4cAkx$`7*ji~3nzE8sIZpAm*nS9Uda3sjqg2~nN*>ji~ODDIpsBp&TrIyDhCZ&{4-oWBL`33VlEaI5}b2k-g diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc b/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc index 6bcb6b74497f25e37c9d25524bb72001ef0b8e3b..277d38dde53d6f1d3cdda79dd039830c65bb7904 100644 GIT binary patch delta 52 vcmeyw{)(NQ`7*{hfsODD%Lt8m8WrIyDhCZ&{4Ud^-tixLy0A@BaTL1t6 delta 183 zcmZ21y|p$%#xVobh?7t<8 diff --git a/ntt_tool/apps/cloud/serializers.pyc b/ntt_tool/apps/cloud/serializers.pyc index f0f4e06f2c402c572890b3d5b07d7a786f76c12e..73d812914b62cb5ac9282ddaeaefd537b1daa647 100644 GIT binary patch delta 621 zcmeAXYZGH<{>;nu)%MCpc1K1h5e5c^R0f79Mut=-hA3u+6h?+97KWf;4JM#O2^Wwk zEl5c$Nll5*&(mN8a*NT#SSKek8q1cjgUqQ&&M8ev)c`UX5JYj*iFjGW1tl3loY*W= z0a*qLzhX8Z0rCiuUSZ_{su!9(m91X@-CAt+fITIH-&2;1Qj@(nrYghDD-j0T;hd9S zni5i!n3k5A9Fm%sm{(F9gge}n@LOTZDgZQ6VX_35FB>Qg1o2GH=8{E=0h7tExTM+H KCD|l7B-sF`8iM8k delta 590 zcmZn@>k(sT{>;m@#rWbzc1Om^KFl(cdl?M`H5h;ZK@`VLHegZVjL%Cgk55cWDV@B5 z%Y-e68K{PRay_RgHw%yz#0nyqCr@M*X2ha=@&%@uY!G#m^O;2%*>Nd^n9ED7xoklk zKzq3-PiEQ3U%~}smKLNWmZYY{=jToKWYv^KIE@qJK6W5c0&;0eYC%cH2K-)^Cf@7(Kr19C2XIV< vh3sn%8A2heNUZUb1-Mul17kV^Llied zDi8rBco@uqoD_D3U=5CmKYgT1gn-(TbMi}5N{SNG(lV1vQu7k?O8hits(@6E2%#htDMDB#o}^A}ueCdF)N@~n z7vacr@BlEo>n1c!{WIS0n{ReJGwc01X#afk>ud_u)#C4ae${U_F+UEZ0GR_52ON!E zNL|Q0n0OX@kk(*~9xUo`1u$slW zX#pPGWcC0LZ!!07G5&^`H(+ufkRSf3F1%$Bw_()V=jxKbeDxe&k;kT#sRd02Qj~;J zSwc&Wsm^wqiZZ6odL^UTESajOOnkS#iV1q}KA#w7(0}zZc%fczO9=BQC$$lVWMiv< zN4o=ftLJxkbjo5m_!jGgpL!2iMn0Q(5#@8ypNf3e=OWdRIiN!}5*39r8D+Q(mz&P$KCL}S~iwf4zw|Ea`?(CqeXw_=DS6TGmRJ9ha}#Mis%q5fY)^&cO&XHs06 zMEVqQM~jHK4Y{J4#j3|&*ckPdVQ?-o402qGv{Zq}(VULZ4kyTo!W>s&^dl})gGh)p xEH3F>&Yk_isOfgYebV&gl$({?*-eXrZ>I`%$t{{hnl3*7(! diff --git a/ntt_tool/apps/cloud/views.pyc b/ntt_tool/apps/cloud/views.pyc index 6e8d6ac839dc4d483883e36c777ca4825f8bde2f..b2e00a68b7ed62d42186f8880a55fc427de866c5 100644 GIT binary patch literal 3940 zcmcgv+j1L45S>|Bk|oO*5)6b(2-gw;EXV_wDxe4<0aArSja8x0%hpCawk5B2#m*?k zl=GDQ0#*DEzrdeRJi|G?l2#_S0?M(y?dh4G*_r9nr+X`ZtTzAr^!J;6HT|jJ|L1tz zZxAv5v`Um3Y1Pw8Qx8NBR4*v>is%*9s}%Z@N|w~9s(RHzud1Y`Ms?Mz7kW)4%WBk6 zy+)zeRnk;lu8h_STFc66HEgL}t>T8dr_^1ge(0^LxVbQ}G9Oq|acf~w+HsnS?|i8J)7Em(4Y3yVB>t`CsUnEeB&-p{Ju^7pdWb~ms5>( z<1BTy=y@Kd*LQAge{XMfvjdwhOd4cqVZ(h~^exCMNj8aZVmCY1&pp85FYveygjKwF z8>nGL4VQQoxK~@_ZQ5nE2e&koZAxQBnVmMKs5Y0DgN9)mjcgeDCVIkfl*N;TY89%y z+t<;`ZVheUJ6}ONN)nm*_jwq<cX!Z#s6#%2 z;iDY_%oYw|V}Uf6tdbsa3$=Oq z(&cQjYc^+ElFWjp0i8|BrAD{(ZP2+8-aT3q~iy zRl-C->I)VN5wP@Y5xr%nc^aJ(!2*9nfS6|~h_n01aC+?ptmqT-0>z6IFHxMQc$wk? z#XQQ)D^wX_=2eQ3ti;Hg|>Bc@c%L#Oqwi zyhHIW&FQ}hcuwZ^a~t_AF992eL^J_my^y$8(R$lG;A zFc3Xj(;5J(6D}Gt&vBvy)h?^BZ7Fxff#WFmsM^HcQp)Agz}e9L)VE{Lf>a*A^tA*c?Elz@&x=0FSqo0y`fjNd`T>1TZtpyUzu&q zC903itL6imT!tuNe99S?%adsxE2uKVHd>9=cAMcS-a^6T!`&R;3x`>LV9>1$Yt|xa z$^0iRw#qtwTHKRP{$Vq#!o>NW8R4WsI6U-QCqEd94+%yTK38nw3RatcZ8-UG`j$h} oQb4MDDI*L|`lPN^aQaE{N%a{o$}zES04lTJrfycw)z6*%8&>gQOaK4? literal 5166 zcmd^D-BKGj6xQ0t#s&f*AqoBOottUnG-=abbW$iur|GmLmEE-U&CcQ#V6*nRD;Y`# zuINMbLHZ(nmOeoHeP`{pfzY8dh3QNH37vDaE9so?e3CZ*=UnCY`+q!dso_r^|5s4# zilKq-mC92pDynWtHA|^nRME8R zmQ}Ny$|V(5RD*9uYX+@pWjxiHRhym)%j#F9j+FYTIj6#kGC9?`B8HjFFt5Vdi6`bV z!-5L0Ogu548Lp~uK@5xXs;imdnhF=ia9s@7GQ*MzuZ!V^7?v`_O%>h{!!0q~%nZva zyrt^ZWq7jv7k;YnrgGD$cH3sp8fV9vEz>heyEW7l>3kQs!BC!u{KT#f+_vetb}Miu z96zd!?Z-W9Qq61V`gQ&3`VVHK5$~AZ#6#`4m-gX2Zo663Yf(H1pJO(4q0w?|0*H5K)|h zC}X=4TJc85w48OsT@Xd`?88TnYnQHdI4FqPFHGVVptG6ix1zvW&3C#Re8t#L zSaNDLR`cy{5mnzL-L|z8wsh7oDQVds(W-67T~q6soj4lUTHG@&`pOSGL2oOr^_=s2 zX3q~cup*IM97leC-)+aeOs)m}zOBiFHHrD1{=VjlXHYDWQ1s@#qF46ZbqKP|MiOjp zwp-t{tz%$LN98^A%%XyfGX?R!M1}DvF=df5&1uGi!ECW&DWI&O*tbzRr8-Em9Mk&% zZHX^Z`^ZC-y?T}YT9;U)D{qGqHW8}g>kysTi${<=T+yR8)ubXqDWV3a)zc=sCp8r=gG1U@Zflv7r$2h1_pc` z#nROyvPPa!H#zx+=>nIlwYrMmh1X1rzq?!sU-(Vk*(eKx8R+= z(@C2r`aqQL9KynmN6+IO{LY@cbNud~eiPt+f-esyvg!VjeK@dkG5nUM;XO$%=hBNO zxz%S+sF$mjoCGz)E9amPQ8p^)i`4ZWEuS fUu7OLK$ax2fFu0qx8hau%cbS=@&lAbv`T*iEzpS; diff --git a/ntt_tool/apps/core/__init__.pyc b/ntt_tool/apps/core/__init__.pyc index ecfb35f818dde7fc71ab9331c9496e73e27318e0..d4be7bfefce6700f3ef5c875a0890980ed749d3e 100644 GIT binary patch delta 29 lcmdnUxR#Nf`7xRH^a`7;nu)%MCpb^%7lpve-9Dy${(CHeW2T^Zc~oOcOm delta 36 rcmZo??q+6Z{>;m@#rWbzb^%7lu*njPDxC3ospavBNhzh19U0vKzV-^8 diff --git a/ntt_tool/apps/core/views.pyc b/ntt_tool/apps/core/views.pyc index 1571661da29fd94c024b30d43def1924b639af10..72d19a0f0aa9155aeedd57f0771ef2d91fe60d25 100644 GIT binary patch delta 72 zcmbQj*1^Wk{F#^QtL>GI>}HIN!IKv-sj!yBm*nS9=4aBKJcH2_O>6=hUw85^CMf_o C&K9cx delta 84 zcmeBRo5IG<{F#?)i}A&c>}HIN;gjtcRXF4GQp@8LlTu12A7s*-JeAP{i@5G&6Q*P= G;_d)nuNxKs diff --git a/ntt_tool/ntt.sql b/ntt_tool/ntt.sql new file mode 100644 index 0000000..42234bb --- /dev/null +++ b/ntt_tool/ntt.sql @@ -0,0 +1,408 @@ +-- MySQL dump 10.13 Distrib 5.6.25, for debian-linux-gnu (x86_64) +-- +-- Host: 127.0.0.1 Database: ntt +-- ------------------------------------------------------ +-- Server version 5.6.25-0ubuntu0.15.04.1 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `auth_group` +-- + +DROP TABLE IF EXISTS `auth_group`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auth_group` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(80) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `auth_group` +-- + +LOCK TABLES `auth_group` WRITE; +/*!40000 ALTER TABLE `auth_group` DISABLE KEYS */; +/*!40000 ALTER TABLE `auth_group` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `auth_group_permissions` +-- + +DROP TABLE IF EXISTS `auth_group_permissions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auth_group_permissions` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `group_id` int(11) NOT NULL, + `permission_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `auth_group_permissions_group_id_0cd325b0_uniq` (`group_id`,`permission_id`), + KEY `auth_group_permissi_permission_id_84c5c92e_fk_auth_permission_id` (`permission_id`), + CONSTRAINT `auth_group_permissi_permission_id_84c5c92e_fk_auth_permission_id` FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`), + CONSTRAINT `auth_group_permissions_group_id_b120cbf9_fk_auth_group_id` FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `auth_group_permissions` +-- + +LOCK TABLES `auth_group_permissions` WRITE; +/*!40000 ALTER TABLE `auth_group_permissions` DISABLE KEYS */; +/*!40000 ALTER TABLE `auth_group_permissions` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `auth_permission` +-- + +DROP TABLE IF EXISTS `auth_permission`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auth_permission` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `content_type_id` int(11) NOT NULL, + `codename` varchar(100) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `auth_permission_content_type_id_01ab375a_uniq` (`content_type_id`,`codename`), + CONSTRAINT `auth_permissi_content_type_id_2f476e4b_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `auth_permission` +-- + +LOCK TABLES `auth_permission` WRITE; +/*!40000 ALTER TABLE `auth_permission` DISABLE KEYS */; +INSERT INTO `auth_permission` VALUES (1,'Can add log entry',1,'add_logentry'),(2,'Can change log entry',1,'change_logentry'),(3,'Can delete log entry',1,'delete_logentry'),(4,'Can add permission',2,'add_permission'),(5,'Can change permission',2,'change_permission'),(6,'Can delete permission',2,'delete_permission'),(7,'Can add group',3,'add_group'),(8,'Can change group',3,'change_group'),(9,'Can delete group',3,'delete_group'),(10,'Can add user',4,'add_user'),(11,'Can change user',4,'change_user'),(12,'Can delete user',4,'delete_user'),(13,'Can add content type',5,'add_contenttype'),(14,'Can change content type',5,'change_contenttype'),(15,'Can delete content type',5,'delete_contenttype'),(16,'Can add session',6,'add_session'),(17,'Can change session',6,'change_session'),(18,'Can delete session',6,'delete_session'),(19,'Can add cloud',7,'add_cloud'),(20,'Can change cloud',7,'change_cloud'),(21,'Can delete cloud',7,'delete_cloud'),(22,'Can add cloud traffic',8,'add_cloudtraffic'),(23,'Can change cloud traffic',8,'change_cloudtraffic'),(24,'Can delete cloud traffic',8,'delete_cloudtraffic'),(25,'Can add cloud traffic tenants',9,'add_cloudtraffictenants'),(26,'Can change cloud traffic tenants',9,'change_cloudtraffictenants'),(27,'Can delete cloud traffic tenants',9,'delete_cloudtraffictenants'); +/*!40000 ALTER TABLE `auth_permission` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `auth_user` +-- + +DROP TABLE IF EXISTS `auth_user`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auth_user` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `password` varchar(128) NOT NULL, + `last_login` datetime(6) DEFAULT NULL, + `is_superuser` tinyint(1) NOT NULL, + `username` varchar(30) NOT NULL, + `first_name` varchar(30) NOT NULL, + `last_name` varchar(30) NOT NULL, + `email` varchar(254) NOT NULL, + `is_staff` tinyint(1) NOT NULL, + `is_active` tinyint(1) NOT NULL, + `date_joined` datetime(6) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `username` (`username`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `auth_user` +-- + +LOCK TABLES `auth_user` WRITE; +/*!40000 ALTER TABLE `auth_user` DISABLE KEYS */; +INSERT INTO `auth_user` VALUES (1,'pbkdf2_sha256$24000$z6Uj4Y0v3T7h$sGmO9zwP2Xxb/Zb1ecxR2gVMKuKGDUWJW1s7F0l00gg=',NULL,1,'admin','','','admin@gmail.com',1,1,'2016-02-27 05:34:15.827140'); +/*!40000 ALTER TABLE `auth_user` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `auth_user_groups` +-- + +DROP TABLE IF EXISTS `auth_user_groups`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auth_user_groups` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) NOT NULL, + `group_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `auth_user_groups_user_id_94350c0c_uniq` (`user_id`,`group_id`), + KEY `auth_user_groups_group_id_97559544_fk_auth_group_id` (`group_id`), + CONSTRAINT `auth_user_groups_group_id_97559544_fk_auth_group_id` FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`), + CONSTRAINT `auth_user_groups_user_id_6a12ed8b_fk_auth_user_id` FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `auth_user_groups` +-- + +LOCK TABLES `auth_user_groups` WRITE; +/*!40000 ALTER TABLE `auth_user_groups` DISABLE KEYS */; +/*!40000 ALTER TABLE `auth_user_groups` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `auth_user_user_permissions` +-- + +DROP TABLE IF EXISTS `auth_user_user_permissions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auth_user_user_permissions` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) NOT NULL, + `permission_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `auth_user_user_permissions_user_id_14a6b632_uniq` (`user_id`,`permission_id`), + KEY `auth_user_user_perm_permission_id_1fbb5f2c_fk_auth_permission_id` (`permission_id`), + CONSTRAINT `auth_user_user_perm_permission_id_1fbb5f2c_fk_auth_permission_id` FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`), + CONSTRAINT `auth_user_user_permissions_user_id_a95ead1b_fk_auth_user_id` FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `auth_user_user_permissions` +-- + +LOCK TABLES `auth_user_user_permissions` WRITE; +/*!40000 ALTER TABLE `auth_user_user_permissions` DISABLE KEYS */; +/*!40000 ALTER TABLE `auth_user_user_permissions` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `cloud_details` +-- + +DROP TABLE IF EXISTS `cloud_details`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `cloud_details` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(256) NOT NULL, + `keystone_auth_url` varchar(2083) NOT NULL, + `keystone_user` varchar(100) NOT NULL, + `keystone_password` varchar(250) NOT NULL, + `keystone_tenant_name` varchar(100) NOT NULL, + `created_on` datetime(6) NOT NULL, + `updated_on` datetime(6) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `cloud_details` +-- + +LOCK TABLES `cloud_details` WRITE; +/*!40000 ALTER TABLE `cloud_details` DISABLE KEYS */; +INSERT INTO `cloud_details` VALUES (1,'Onecloud','https://github.com/onecloud/ntt_tool_python','admin','admin','admin','2016-03-01 05:12:15.246958','2016-02-27 05:35:21.670275'),(2,'CloudUno','https://github.com/onecloud/ntt_tool_python','test','test','test','2016-02-27 05:58:02.993225','2016-02-27 05:58:02.993265'),(3,'Airtel','http://10.1.32.11:5000/v2.0','admin','oc123','admin','2016-02-29 09:56:59.959767','2016-02-29 09:56:59.959941'),(4,'Vodafone','http://h.com','hello','aadsfsaf','vodafone chennai','2016-02-29 10:35:12.595484','2016-02-29 10:35:12.595531'); +/*!40000 ALTER TABLE `cloud_details` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `cloud_traffic` +-- + +DROP TABLE IF EXISTS `cloud_traffic`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `cloud_traffic` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(256) NOT NULL, + `allowed_delta_percentage` double NOT NULL, + `test_result_path` varchar(250) NOT NULL, + `number_of_workers` int(11) NOT NULL, + `remote_user` varchar(100) NOT NULL, + `remote_pass` varchar(100) NOT NULL, + `test_method` varchar(100) NOT NULL, + `iperf_duration` int(11) NOT NULL, + `tenant_type` varchar(20) NOT NULL, + `created_on` datetime(6) NOT NULL, + `updated_on` datetime(6) NOT NULL, + `cloud_id` int(11) NOT NULL, + `external_host` varchar(100), + PRIMARY KEY (`id`), + KEY `cloud_traffic_cloud_id_ac74e46e_fk_cloud_details_id` (`cloud_id`), + CONSTRAINT `cloud_traffic_cloud_id_ac74e46e_fk_cloud_details_id` FOREIGN KEY (`cloud_id`) REFERENCES `cloud_details` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `cloud_traffic` +-- + +LOCK TABLES `cloud_traffic` WRITE; +/*!40000 ALTER TABLE `cloud_traffic` DISABLE KEYS */; +INSERT INTO `cloud_traffic` VALUES (1,'Hello Traffic',1,'sadad',1000,'ads','asd','asdfas',1,'all','2016-02-29 13:14:13.484433','2016-02-27 05:40:15.840123',1,'192.168.12.9'),(2,'vodafone bangalore',3,'/home/',2,'admin','admin','true',60,'all','2016-02-29 10:51:36.858036','2016-02-29 10:51:36.858071',4,NULL),(3,'Hello Traffic',2,'/home/',1000,'admin','admin','admintest',1,'all','2016-02-29 13:37:28.179671','2016-02-29 13:37:28.179714',1,NULL); +/*!40000 ALTER TABLE `cloud_traffic` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `cloud_traffic_tenants` +-- + +DROP TABLE IF EXISTS `cloud_traffic_tenants`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `cloud_traffic_tenants` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `tenant_name` varchar(256) NOT NULL, + `ssh_gateway` varchar(256) DEFAULT NULL, + `created_on` datetime(6) NOT NULL, + `updated_on` datetime(6) NOT NULL, + `cloud_traffic_id` int(11) NOT NULL, + `creator_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `cloud_traffic_tena_cloud_traffic_id_1a906c3d_fk_cloud_traffic_id` (`cloud_traffic_id`), + KEY `cloud_traffic_tenants_creator_id_36dea512_fk_auth_user_id` (`creator_id`), + CONSTRAINT `cloud_traffic_tena_cloud_traffic_id_1a906c3d_fk_cloud_traffic_id` FOREIGN KEY (`cloud_traffic_id`) REFERENCES `cloud_traffic` (`id`), + CONSTRAINT `cloud_traffic_tenants_creator_id_36dea512_fk_auth_user_id` FOREIGN KEY (`creator_id`) REFERENCES `auth_user` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `cloud_traffic_tenants` +-- + +LOCK TABLES `cloud_traffic_tenants` WRITE; +/*!40000 ALTER TABLE `cloud_traffic_tenants` DISABLE KEYS */; +INSERT INTO `cloud_traffic_tenants` VALUES (2,'admin','192.168.12.9','2016-02-27 05:42:55.338374','2016-02-27 05:42:55.338482',1,1),(3,'172.168.2.44:8000','172.168.2.44:8000','2016-02-29 11:58:09.559724','2016-02-29 11:58:09.559757',2,1); +/*!40000 ALTER TABLE `cloud_traffic_tenants` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `django_admin_log` +-- + +DROP TABLE IF EXISTS `django_admin_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `django_admin_log` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `action_time` datetime(6) NOT NULL, + `object_id` longtext, + `object_repr` varchar(200) NOT NULL, + `action_flag` smallint(5) unsigned NOT NULL, + `change_message` longtext NOT NULL, + `content_type_id` int(11) DEFAULT NULL, + `user_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `django_admin__content_type_id_c4bce8eb_fk_django_content_type_id` (`content_type_id`), + KEY `django_admin_log_user_id_c564eba6_fk_auth_user_id` (`user_id`), + CONSTRAINT `django_admin__content_type_id_c4bce8eb_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`), + CONSTRAINT `django_admin_log_user_id_c564eba6_fk_auth_user_id` FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `django_admin_log` +-- + +LOCK TABLES `django_admin_log` WRITE; +/*!40000 ALTER TABLE `django_admin_log` DISABLE KEYS */; +/*!40000 ALTER TABLE `django_admin_log` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `django_content_type` +-- + +DROP TABLE IF EXISTS `django_content_type`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `django_content_type` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `app_label` varchar(100) NOT NULL, + `model` varchar(100) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `django_content_type_app_label_76bd3d3b_uniq` (`app_label`,`model`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `django_content_type` +-- + +LOCK TABLES `django_content_type` WRITE; +/*!40000 ALTER TABLE `django_content_type` DISABLE KEYS */; +INSERT INTO `django_content_type` VALUES (1,'admin','logentry'),(3,'auth','group'),(2,'auth','permission'),(4,'auth','user'),(7,'cloud','cloud'),(8,'cloud','cloudtraffic'),(9,'cloud','cloudtraffictenants'),(5,'contenttypes','contenttype'),(6,'sessions','session'); +/*!40000 ALTER TABLE `django_content_type` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `django_migrations` +-- + +DROP TABLE IF EXISTS `django_migrations`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `django_migrations` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `app` varchar(255) NOT NULL, + `name` varchar(255) NOT NULL, + `applied` datetime(6) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `django_migrations` +-- + +LOCK TABLES `django_migrations` WRITE; +/*!40000 ALTER TABLE `django_migrations` DISABLE KEYS */; +INSERT INTO `django_migrations` VALUES (1,'contenttypes','0001_initial','2016-02-27 05:30:29.318686'),(2,'auth','0001_initial','2016-02-27 05:30:30.564825'),(3,'admin','0001_initial','2016-02-27 05:30:30.919881'),(4,'admin','0002_logentry_remove_auto_add','2016-02-27 05:30:30.941389'),(5,'contenttypes','0002_remove_content_type_name','2016-02-27 05:30:31.229480'),(6,'auth','0002_alter_permission_name_max_length','2016-02-27 05:30:31.359888'),(7,'auth','0003_alter_user_email_max_length','2016-02-27 05:30:31.463488'),(8,'auth','0004_alter_user_username_opts','2016-02-27 05:30:31.476924'),(9,'auth','0005_alter_user_last_login_null','2016-02-27 05:30:31.600098'),(10,'auth','0006_require_contenttypes_0002','2016-02-27 05:30:31.605120'),(11,'auth','0007_alter_validators_add_error_messages','2016-02-27 05:30:31.616106'),(12,'cloud','0001_initial','2016-02-27 05:30:32.306419'),(13,'cloud','0002_auto_20160225_1631','2016-02-27 05:30:32.365825'),(14,'cloud','0003_auto_20160225_1726','2016-02-27 05:30:32.625484'),(15,'cloud','0004_auto_20160226_1322','2016-02-27 05:30:32.880957'),(16,'sessions','0001_initial','2016-02-27 05:30:32.969106'); +/*!40000 ALTER TABLE `django_migrations` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `django_session` +-- + +DROP TABLE IF EXISTS `django_session`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `django_session` ( + `session_key` varchar(40) NOT NULL, + `session_data` longtext NOT NULL, + `expire_date` datetime(6) NOT NULL, + PRIMARY KEY (`session_key`), + KEY `django_session_de54fa62` (`expire_date`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `django_session` +-- + +LOCK TABLES `django_session` WRITE; +/*!40000 ALTER TABLE `django_session` DISABLE KEYS */; +/*!40000 ALTER TABLE `django_session` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2016-03-01 10:47:01 diff --git a/ntt_tool/settings.pyc b/ntt_tool/settings.pyc index a88f971fc5cda5c2023229631e4c3a6d92c8fd6a..3ee8d9d8e513f78e9b2a2bec1da459ced59fa682 100644 GIT binary patch delta 155 zcmew^{aZ?!`7NpP^cqI5bVi00YX-9v8-^5H2D2y`hD>IL zR3?TjS%wrl2B2s&17nIkgIOvULy7~CLX&X>YLR0|VPXi@aM~=+bd`N`6xV7dMxV)S jyeh0E@g@2BlZ|;T7+WUi@YZm%axrl+GcyV^vNHkz9c&;) delta 297 zcmew@^<7$;`7O2b^cu#16l;bQ8-{ddh7?-{vlKgq6nh4< zC>e%KW`^^HYBLeDX};+8BLcB zx~|RNIcG63227sBqrw@Vms%d5n3PgFc{h&*W5?t#JT?5x%#6&8TufX*T9}cY5dieL BRfhlo diff --git a/ntt_tool/urls.pyc b/ntt_tool/urls.pyc index e6bb90d75efe8051eddd49353a98057e83642121..95b0b255742550d4a68e8719ca0421b89a25eb72 100644 GIT binary patch delta 32 ocmbQiGlhqp`7*{8BH`b?h7s=^tcms%d5n3PgF`53Do0NS7oVgLXD diff --git a/ntt_tool/wsgi.pyc b/ntt_tool/wsgi.pyc index c93d3dd56fe59ce6749e18ad8b88cdff99787831..aa2bea456337b81ae7d4b35fe84f7c06cdb01004 100644 GIT binary patch delta 32 ocmeyw@{Wa_`7+5a*!`b=hJQsIoxOD&I2OiC%8tjFX40PU0vCIA2c From c210d82df9ab9b769c0f022cb90980da0ed663a4 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Tue, 1 Mar 2016 11:35:04 +0530 Subject: [PATCH 08/57] Removed pdb --- ntt_tool/apps/cloud/views.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index 759a943..11337ce 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -13,20 +13,6 @@ class CloudViewSet(viewsets.ModelViewSet): authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) - def create(self, request, *args, **kwargs): - import pdb - pdb.set_trace() - serializer = self.get_serializer(data=request.data) - serializer.is_valid(raise_exception=True) - self.perform_create(serializer) - headers = self.get_success_headers(serializer.data) - return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) - - def update(self, request, *args, **kwargs): - import pdb - pdb.set_trace() - print "I am update" - class CloudTrafficViewSet(viewsets.ModelViewSet): queryset = CloudTraffic.objects.all() From db0356fb4e794e914d22116b21dfe6ce098e6259 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Tue, 1 Mar 2016 13:21:14 +0530 Subject: [PATCH 09/57] Traffic Form: Converted type field from text to dropdown --- ntt_tool/apps/cloud/views.py | 3 ++- ntt_tool/static/js/apps/controllers/cloudcontroller.js | 4 +++- ntt_tool/static/partials/cloud/cloudtraffic_form.html | 8 +++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index 11337ce..56c4b43 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -41,7 +41,8 @@ class CloudTrafficTenantsViewSet(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): traffic_id = self.request.GET.get("traffic_id") - queryset = self.filter_queryset(CloudTrafficTenants.objects.filter(cloud_traffic_id=traffic_id)) + queryset = self.filter_queryset( + CloudTrafficTenants.objects.filter(cloud_traffic_id=traffic_id)) page = self.paginate_queryset(queryset) if page is not None: diff --git a/ntt_tool/static/js/apps/controllers/cloudcontroller.js b/ntt_tool/static/js/apps/controllers/cloudcontroller.js index 75ec95a..57fd854 100644 --- a/ntt_tool/static/js/apps/controllers/cloudcontroller.js +++ b/ntt_tool/static/js/apps/controllers/cloudcontroller.js @@ -65,7 +65,9 @@ nttApp.controller('CloudTrafficCtrl', function($scope, $routeParams, $location, $scope.cloud = data; }); - $scope.cloudTraffic = {}; + $scope.cloudTraffic = { + "tenant_type": "all" + }; if($scope.event == 'edit'){ cloudTrafficService.get($routeParams.trafficId).then(function(data){ $scope.cloudTraffic = data; diff --git a/ntt_tool/static/partials/cloud/cloudtraffic_form.html b/ntt_tool/static/partials/cloud/cloudtraffic_form.html index e43fffb..59414ad 100644 --- a/ntt_tool/static/partials/cloud/cloudtraffic_form.html +++ b/ntt_tool/static/partials/cloud/cloudtraffic_form.html @@ -47,7 +47,13 @@

Cloud > Traffic

- +
Cancel From 4b00be4e6c7ddec405028c3106abbb01cff351e6 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Thu, 3 Mar 2016 11:45:27 +0530 Subject: [PATCH 10/57] added git ignore file --- .gitignore | 0 test.txt | 1 - 2 files changed, 1 deletion(-) create mode 100644 .gitignore delete mode 100644 test.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/test.txt b/test.txt deleted file mode 100644 index 45b983b..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -hi From 4e4c5924729f4a1c43d3124ab7f6b7d42e9bfe7f Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Thu, 3 Mar 2016 11:48:04 +0530 Subject: [PATCH 11/57] added git ignore --- .idea/workspace.xml | 221 +++++++++++++++++++++++++++----------------- 1 file changed, 136 insertions(+), 85 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8a29066..a786018 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,10 @@ - + - - - - + @@ -33,20 +30,20 @@ - + - - + + - + - + @@ -56,7 +53,7 @@ - + @@ -66,18 +63,28 @@ - + + + + + + + + + + + - - + + @@ -87,7 +94,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -152,15 +181,15 @@ @@ -171,9 +200,9 @@ @@ -200,8 +229,6 @@ - - @@ -492,8 +519,36 @@ + + + + + + + + + + + + + + + + @@ -780,27 +835,27 @@ - + - + - + - - + + @@ -852,22 +907,15 @@ - - - - - - - + + + - - - @@ -1041,7 +1089,6 @@ - @@ -1049,7 +1096,6 @@ - @@ -1060,19 +1106,10 @@ - - - - - - - - - @@ -1102,7 +1139,6 @@ - @@ -1110,7 +1146,6 @@ - @@ -1118,15 +1153,6 @@ - - - - - - - - - @@ -1134,7 +1160,6 @@ - @@ -1146,18 +1171,26 @@ - + - - + + - + - - + + + + + + + + + + @@ -1170,26 +1203,26 @@ - + - + - + - + - + - + @@ -1197,39 +1230,57 @@ - - + + + + - + - - + + - - + + - + + + + + + + + + - + - + - - + + + + + + + + + + From ffec64f839bb40f4ffbc4735d195ca238326f5c2 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Thu, 3 Mar 2016 11:58:27 +0530 Subject: [PATCH 12/57] Remove *.pyc --- .idea/workspace.xml | 48 +++---- ntt_tool/.gitignore | 133 ++++++++++++++++++ ntt_tool/apps/__init__.pyc | Bin 168 -> 0 bytes ntt_tool/apps/cloud/__init__.pyc | Bin 174 -> 0 bytes ntt_tool/apps/cloud/admin.pyc | Bin 231 -> 0 bytes .../apps/cloud/migrations/0001_initial.pyc | Bin 3020 -> 0 bytes .../migrations/0002_auto_20160225_1631.pyc | Bin 847 -> 0 bytes .../migrations/0003_auto_20160225_1726.pyc | Bin 1305 -> 0 bytes .../migrations/0004_auto_20160226_1322.pyc | Bin 1002 -> 0 bytes ntt_tool/apps/cloud/migrations/__init__.pyc | Bin 185 -> 0 bytes ntt_tool/apps/cloud/models.pyc | Bin 3491 -> 0 bytes ntt_tool/apps/cloud/serializers.pyc | Bin 2822 -> 0 bytes ntt_tool/apps/cloud/urls.pyc | Bin 601 -> 0 bytes ntt_tool/apps/cloud/views.pyc | Bin 3940 -> 0 bytes ntt_tool/apps/core/__init__.pyc | Bin 173 -> 0 bytes ntt_tool/apps/core/urls.pyc | Bin 391 -> 0 bytes ntt_tool/apps/core/views.pyc | Bin 776 -> 0 bytes ntt_tool/settings.pyc | Bin 3451 -> 0 bytes ntt_tool/urls.pyc | Bin 1556 -> 0 bytes ntt_tool/wsgi.pyc | Bin 622 -> 0 bytes 20 files changed, 152 insertions(+), 29 deletions(-) create mode 100644 ntt_tool/.gitignore delete mode 100644 ntt_tool/apps/__init__.pyc delete mode 100644 ntt_tool/apps/cloud/__init__.pyc delete mode 100644 ntt_tool/apps/cloud/admin.pyc delete mode 100644 ntt_tool/apps/cloud/migrations/0001_initial.pyc delete mode 100644 ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc delete mode 100644 ntt_tool/apps/cloud/migrations/0003_auto_20160225_1726.pyc delete mode 100644 ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc delete mode 100644 ntt_tool/apps/cloud/migrations/__init__.pyc delete mode 100644 ntt_tool/apps/cloud/models.pyc delete mode 100644 ntt_tool/apps/cloud/serializers.pyc delete mode 100644 ntt_tool/apps/cloud/urls.pyc delete mode 100644 ntt_tool/apps/cloud/views.pyc delete mode 100644 ntt_tool/apps/core/__init__.pyc delete mode 100644 ntt_tool/apps/core/urls.pyc delete mode 100644 ntt_tool/apps/core/views.pyc delete mode 100644 ntt_tool/settings.pyc delete mode 100644 ntt_tool/urls.pyc delete mode 100644 ntt_tool/wsgi.pyc diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a786018..68939b6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,8 @@ + - - - @@ -33,7 +31,7 @@ - + @@ -83,7 +81,7 @@ - + @@ -105,7 +103,7 @@ - + @@ -840,20 +838,20 @@ + - + + + - - - @@ -907,16 +905,6 @@ - - - - - - - - - - @@ -1124,7 +1112,6 @@ - @@ -1167,7 +1154,6 @@ - @@ -1175,7 +1161,6 @@ - @@ -1191,7 +1176,6 @@ - @@ -1199,7 +1183,6 @@ - @@ -1247,7 +1230,7 @@ - + @@ -1257,7 +1240,6 @@ - @@ -1271,15 +1253,23 @@ - + + + + + + + + + - + diff --git a/ntt_tool/.gitignore b/ntt_tool/.gitignore new file mode 100644 index 0000000..2befe9f --- /dev/null +++ b/ntt_tool/.gitignore @@ -0,0 +1,133 @@ +# Created by .ignore support plugin (hsz.mobi) +### SublimeText template +# cache files for sublime text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# workspace files are user-specific +*.sublime-workspace + +# project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using SublimeText +# *.sublime-project + +# sftp configuration file +sftp-config.json +### Python template +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ +### VirtualEnv template +# Virtualenv +# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ +.Python +[Bb]in +[Ii]nclude +[Ll]ib +[Ss]cripts +pyvenv.cfg +pip-selfcheck.json +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + diff --git a/ntt_tool/apps/__init__.pyc b/ntt_tool/apps/__init__.pyc deleted file mode 100644 index a6e91fcfa3e23c7c46c617688ff1f752e3b4e389..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmZSn%**xF_DWbX0~9aG?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=Pb?@X){l?R%*!l^ ZkJkgrasW-W$<0qG%}KQb*G?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=Pb?@X)(30SkB`sH d%PfhH*8{5I0Ge%+o1apelWGTYK`{_B002^IEolG% diff --git a/ntt_tool/apps/cloud/admin.pyc b/ntt_tool/apps/cloud/admin.pyc deleted file mode 100644 index 5f88618ac9688b755c992b6e71222172b4d173f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmY*TI}XAy40T!|AtabMM5g8ffH(mIAO@DIG!YaMyCUwuJ-G>D2B#n-Ea&<8^Bm`o z@#s0f?`rs3CUGe*P6e#E0uK-r>=h`R!A9rOXkKDk3FCo4WkZ82owPg=u;&VoRMdog zZ4PUxfc}TLmE4>tID_s&zKe#?)t)+Ae$)n;xnv@rSWn9K#wWsGZmPD8rWcw1ghB>} QvUnEAcHS-0fiZpj2DX?x%K!iX diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.pyc b/ntt_tool/apps/cloud/migrations/0001_initial.pyc deleted file mode 100644 index dc5286c1c24fd572b992e515aa399d185dc3f3f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3020 zcmcguS#KLR5T2D}`G_4mhn=M9;WPoF7h6sb_e#<@wu1((Q$ThC)Gq`jQWE9Wa|OGkAvxb%V*U4pxj*jx_N)iRr;hIjP=j3HK;d5m zF~B&2!w4dp*C4LJxDJQ)Ft0=0fbkR@PQkbdhs}UCAfAT98BkN8r(iS-{RmVOeg${| z@YCTes0Qq}rtu8(7k*k1j@%MHd}4Z5X%QQzGa2VWGJ}#_J7wF}c1w{4zimej@ zA27I7>U>zyneh4ORp9EYz#A{`_Hn6m6V$h$9)Q{c^$^rH45mP>gSy4RXyfU1vT&nV zPNF*qa)jR5o9Yu@egV{{pfAGc5{xh{F2iUU)MubR#|>+E$^ZisoWA)_r+@Kpoc?7= zubNO_mEhN$hAdLwgqSnQcjvSDMm~27KI-0^)QZvx%&{5*^ZO<90rrX&=&LNOyW-PN4aimYU#B-e)8Jk}; zt3TIS*XCOA-n7l*9bcXmnuYvX#5x(cp#khR{sQXYR=Kl@7I@fD_$)RzvD5g4s>sth z*a*(7NM)WM+f121Np!io!s$dNE?7cssvse3;;4@?vBVyGlKE5-L6S{KqfAJp9Cb&V za(`o!dgLvkw38;zJ#D4B!pUx|J*{PD9%QoLH$6|?PR6l4#=WsCIw?|}^>pIoKzr)5 zPUlW!I`^>?sdPj3N8-m_oeA3)NbN{xxhKbGdTgB*{u_CLmgj86UtyH=%(LaWw%gK~GonkA+8D%fWgHzEa z_uQ zCY)C00Ob$op3VGnsUivkMA$U^nx2gV|HPKAetj@rQhR+wg4)}|a;o>{*tD)787?Kk zMJ5CnxDa>&@Ug}z75+hn&f*J3VjMP#4u^(9nIFqErLw`Gr8-eM>78`=0aLRYOF!xi9U}g`-0`%vrF79qSSGF^Icg-6f#pn7U3LTK9$tf(?)KLH z_SViWyToE8h6_>)7sBZy@8h&Rv}4^)^pTBy-o`e_87sp6?Zi1JoV78Hcp%aftnp+r zZ=)OYHZN+QUd7rQ8yk0o2~J;6PdXF~qLDwtN3+(fFE?hRX6<&gT=`zF)uXw3i7%pr z{^`3IZ4{%mmvnA0dOO-cv_<W=(U%_*kkfMJv&K{co_)#k&9i diff --git a/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc b/ntt_tool/apps/cloud/migrations/0002_auto_20160225_1631.pyc deleted file mode 100644 index 754b84cc4c664b3f177f52a62118a35f30648f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 847 zcmc&zO^?$s5S@IqyInx4w0|O}O&Y|WScEumgF{wAq8H1=)7Fb)hkDGaXZVTy6SQX- zJKgP#D^4_-=ds6c-Z;hY7Z(pVzdrSF90h;hLJt0h9mQ`324Kiwok13H4km}8fOWyR z04(6HgiQvjgr5LE06wovP&2r#=A1$Q;ZbGm(UMKDx_1hN(S&@`iZ6549g(oiD7+>Eetz;OAvlJ;`5(LJG+mOP#FyfbQA6q8H=@m-pLDQfY4iaz70 z_dBtbg!l4L<&6KqAnBDdh_qjb#7T(3sbG*{JWk<=R-x@R`Y!1jkLj4*fbTULl{UGN zzAvm@zBN6qjEl~JTDgIBAfH`v5E~jmbnQO_FQJiQ;;sf hMCeL=Nrk2)r%ICdf67TsdOfw}P5fbe$!3`^i@zy()ZYLA diff --git a/ntt_tool/apps/cloud/migrations/0003_auto_20160225_1726.pyc b/ntt_tool/apps/cloud/migrations/0003_auto_20160225_1726.pyc deleted file mode 100644 index d2b739e564517d89a8921e32e67f1b8e63b03052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1305 zcmc&z!EVz)5FOizle9^xK!7-Kw>ZRUs+J2NLfQ%m3X;}|Zm`#fp5Y_- zF#ZH_hM9HTqF&&JZH;GVXJ+Tky!C#JwthbU{vn0U;0f*Ku zNEZqZVy{_yAUjZWA?`xqL+m%!4#*zFec)XXUC0Npbb$Nt72pfN$9Mp|1B;-CXJo(d z2^`eSE{a-Zspf*o%!o3PRkPE_ok|#!sZ|xYAiM!p3cQDOb4Y$F&C zzuV!%zlDz|Tx>%=++xO{D!L}kOd_#P2z5kUw}B_R6xm9>5m%N-JWte08w%kU_88k3 zB$^>a^VwoPJ35XmXK7%w^Rw6Nd~qDH)AvWmZ*5AwM*3QA2Iv7dqWX->@KP5dRN|AC zbrotQ?6_HTaHxzi%xEo1vkF^ZnM4w$*PfP4zpEZnmK~$*vD0bal=YccyeglxTJg@)& diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc b/ntt_tool/apps/cloud/migrations/0004_auto_20160226_1322.pyc deleted file mode 100644 index 277d38dde53d6f1d3cdda79dd039830c65bb7904..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1002 zcmc&yO>@&Q5M6)7P12U>3I2jlb>c#~KnLgyH#oQqGvuOiBPDSvOU9Cz_8fj9|AgTT zyX&?YZrspl)^AtR`t80=ejZPMz5ele3HK|(?;D80T_TXUBhUbC1d9kF@?+33v#R%jGuJR1?G{14>5h8zrCYWYvr4qXFs;{-nV>+3l zX`6Ll`^FmQ>0OJrwDS{$A0AE~nLfejJ7OvjC?JCJ2-e6nWUANbZ9f z$OBLrY!5(=L5)F9Ku$p(65c_AdmY1K0@YQ1jQSDDq~?^4N_iEm5y{c IiJvBa00;H&g8%>k diff --git a/ntt_tool/apps/cloud/migrations/__init__.pyc b/ntt_tool/apps/cloud/migrations/__init__.pyc deleted file mode 100644 index cc13e061d2ec5c93d8293c39101869007a47e6f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmZ8bK?(vf46Nuu1pl!o^8poK;6?Bn>bC4w+oag^;6MF|csE_dgMpb$h6&01wO+k< z&vS3SHPe1jl!cNr=F~Ok*eRJmDi`%&AZ0GC_I9s#?AhtnOphF& zI5>ZT|HVH+T)4nj)w{D}hY*28;)_ ziNS9~IngMhG@^**nDUrL9ZEYv?od8Qqj^f_AU1k zc}(|nSDQ-#e!~I&0+S_<%f@ulnFM=5QHm%UO^gsC#5U7(M1z1DpE=Piv^2p7vB3wi z;PGYgS($3^c+jkpL3-e`*aW{u$-(Y2cISB*=~pVZ#jzh|ge+ta7ct-Pm3J=ZnM~C9 z+z(yR$UQwCS3P;C7mjsre4Z@e%?yYt#?XzznjBTa`$?8~V3X(B{!o`sGMk5ta2WnN z)Tj2m^4O3<28XIHbI;*7+8T(u>^Ig`b>>RrZ?yfqEp*`}JMw~WwYP`a$j(+gENd%i z>z5Wrqg)|kJvI|j;+Z8*X8&XM_)xh_Do$ZH+MIr3%woZjRLxa<8;WOMFz?(vEC5tO)^_S6Q#GN z8kpE8N)bLB?vlCH6!11z(>|kjzSNHbW<>Fn6%P&tL{kr2Uh%Ny z)PqT}asce3!j*nlGv*Iie&F4M=b~a4F+LJUaS;oDu*mY8?3q0K9JZptN^k*19#zK^;(T>*|&w)$5!rT54fn(R)C5c zYd@6bfoywhC(O%)ThyZ?TPinDV9`@sR-X4$+L7~C3Ej42CR?$~yFuAQXFQ`l!`cI7 z>Qeg*M9Pm$DA=EmZL-NS6S;kb9-+{=8oJ6SyneF91LOQX^X*M6$;(zBW9Y`6D14SW zo6)ss73|A@{8^3eNB08@^IqF592lZ%>Z~E-tDTGm^-AY<5lvf{E;nu_v?ZZYnQ9EW z9rR&nQ5J>smL_cs`V)Rh7la+9p>L61Mcg7LX7o1DfXn&8C%ZSo|8U9&{Iyr zly>>9o)vhg=R2(9AO!K3awN6ht`1Ios17cfsv4?e9LSkIPnfa;^K*ZKbbiocVLJPi zcgV%wjc%eW?#s9tKc6+mN)2jXm*_wfxRJk&!AMWJ*9R+<+0h=ib$g*@3?XtaIPoz@ rp*`eF>>2;FAPgv}On3wD?f#Me`SZ|Cf5`_?@%6V6;nUe!-?{r2V9Ok0 diff --git a/ntt_tool/apps/cloud/serializers.pyc b/ntt_tool/apps/cloud/serializers.pyc deleted file mode 100644 index 73d812914b62cb5ac9282ddaeaefd537b1daa647..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2822 zcmd5;!EVz)5FOizlcp_HfRF+RAx;(t`~!ecxl#_B2#H)QE4!g?9Xs-FfO3Vu;J5e_ z#2MzTleJqoAkj97>dEYmxBK?ZyvYVX_6I+oe}6lr)hFQZm;C5&Y$X4AloQQ8nt0@4 z>{IU3SO%m#Itggzk?hb{qAx`6CLNO9Rv>hNF3Dai(0755_x)7noI*rFr&QRl1%;aQ`U#%bFUBO zlNd$d#dO#lDU-V8*uXBoa8&?fK-Gq7&e%! zch$haHvnijp>OW-m!)l7rL$Q!eVu9Zzja{G^=A#BB9$$nx&}D=JVOyEYDh7AJZvKp zeZ0g^%Um@}NDScCENxBlpb5~kPToWI&rzjJm8lQvaubM3ImE80m39IpCzCr`K$9+{ zj67zx*#PIXQY$?R1gy}lsGGn=jayAL>Ojk~$+wD@YGIDW4*nHCEpr{UfcB*U4^rM9 zF{2i40oqE;ciC^(!{ye2Yv%tZWa09+frLG9tZa>V@iPkrt&;_a?PQHrkro^7y|@30 zNpGqJKX!C&O%@Lr(jy1Ue-oi287QJs+9b1zFDD<%>QwLy8MF+0718#Vb%a|d+;Ml1rP`v7`7x#lXa0s;?}yK23Ww$M{lv$-v&nc1kN~BCl>lL}2hxMmhn3%AA7lp>=)<-P z9{{T!U=Ox^$U1-n`0zj+a2N36Kjy@t!)vY@0rKX;G2Ai8`Va*JR#5!#3Iuy(l{K|& zL7zdb8^YSOgiX1nF56V)IA-To;Cgy2NKIZpn2K5?yoD z5sOyik-s_P7fz}|Bk|oO*5)6b(2-gw;EXV_wDxe4<0aArSja8x0%hpCawk5B2#m*?k zl=GDQ0#*DEzrdeRJi|G?l2#_S0?M(y?dh4G*_r9nr+X`ZtTzAr^!J;6HT|jJ|L1tz zZxAv5v`Um3Y1Pw8Qx8NBR4*v>is%*9s}%Z@N|w~9s(RHzud1Y`Ms?Mz7kW)4%WBk6 zy+)zeRnk;lu8h_STFc66HEgL}t>T8dr_^1ge(0^LxVbQ}G9Oq|acf~w+HsnS?|i8J)7Em(4Y3yVB>t`CsUnEeB&-p{Ju^7pdWb~ms5>( z<1BTy=y@Kd*LQAge{XMfvjdwhOd4cqVZ(h~^exCMNj8aZVmCY1&pp85FYveygjKwF z8>nGL4VQQoxK~@_ZQ5nE2e&koZAxQBnVmMKs5Y0DgN9)mjcgeDCVIkfl*N;TY89%y z+t<;`ZVheUJ6}ONN)nm*_jwq<cX!Z#s6#%2 z;iDY_%oYw|V}Uf6tdbsa3$=Oq z(&cQjYc^+ElFWjp0i8|BrAD{(ZP2+8-aT3q~iy zRl-C->I)VN5wP@Y5xr%nc^aJ(!2*9nfS6|~h_n01aC+?ptmqT-0>z6IFHxMQc$wk? z#XQQ)D^wX_=2eQ3ti;Hg|>Bc@c%L#Oqwi zyhHIW&FQ}hcuwZ^a~t_AF992eL^J_my^y$8(R$lG;A zFc3Xj(;5J(6D}Gt&vBvy)h?^BZ7Fxff#WFmsM^HcQp)Agz}e9L)VE{Lf>a*A^tA*c?Elz@&x=0FSqo0y`fjNd`T>1TZtpyUzu&q zC903itL6imT!tuNe99S?%adsxE2uKVHd>9=cAMcS-a^6T!`&R;3x`>LV9>1$Yt|xa z$^0iRw#qtwTHKRP{$Vq#!o>NW8R4WsI6U-QCqEd94+%yTK38nw3RatcZ8-UG`j$h} oQb4MDDI*L|`lPN^aQaE{N%a{o$}zES04lTJrfycw)z6*%8&>gQOaK4? diff --git a/ntt_tool/apps/core/__init__.pyc b/ntt_tool/apps/core/__init__.pyc deleted file mode 100644 index d4be7bfefce6700f3ef5c875a0890980ed749d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmZSn%**xF_DWbX0~9aG?OH<-gvJ&&s^Y!yeN=o8O^7C^*EHER!pt2+*KM&5=Pb?@X)=$naO4W~# f&&xasIaM;O8vJU((B0WGr0)9v}#41Oy3<1i@JezJQ>hQ6QWITYyurTfi&T z6j%aMZ0OSx>=JIvJtFHr>6DTX?voh|q8nqzf`V!ErQpf|nd@lX^SXCWnVauUQIU%# zIAn1>S8rxUTv2RyCT>#IrFdTvO|B^i^-RX?kIYlgQ(1(`EobnEFm?ZmC@F-0Gn43T z3QkA&ko=T&imvl%vhDXg9TBm`lsuyuw8IN-Q~Zmy8HTL8G&;??Dk}5dXCc|iy9-vB Jd9xF-QeS~zTwDME diff --git a/ntt_tool/apps/core/views.pyc b/ntt_tool/apps/core/views.pyc deleted file mode 100644 index 72d19a0f0aa9155aeedd57f0771ef2d91fe60d25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 776 zcmcgp%}&EG40hUWz$B!Bc!-|XI|78baT!u4O=6d*wB8SElTo`2&f^hz6T}(p46!GG zsQ&WVuAR?G{Bhj>ynLS&@Uvpsuf^zGpp?%*1yCE98ZhcdP(@J3Fpb5J0b`gMC_C^5 zum!lEcA)ISIO$3G@=I1?gz>3BgRaEJvbPP=+B?Est|Ph05;uG#JlpnhvajmAf${U36|;ezWb6lM~EL@QZ=u$u9K zkOrSxBo4v6nG@?ctBuk`7zCiPuyo;TOdYO#)l%vm7L{*HTR!G)?o-FiGO(|d1!C8) zyzuVVPxJMf(!w{GKFicJl)S#d9D@*2x$RyR$1job=TP HW)Ob^kN>^L diff --git a/ntt_tool/settings.pyc b/ntt_tool/settings.pyc deleted file mode 100644 index 3ee8d9d8e513f78e9b2a2bec1da459ced59fa682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3451 zcmb6b*>=-L^x96G#1Qr!3Z_5_fyjhFSjwi@N-%gkmO`i=(2+e8TaFf^88r>B^b`9d zJ^g_8&PcKy5)Q@7%$>RWD&_u}FPtp@^}Y+qXAbw*_-B7-00@AIYX(Rb+zglq#BdhO zEYJ)Laxj=W089hT!Jdg{pn%Hy#C`!BtU$R0C zxr7K5d>K|9JY50u6OgMwu0anOi?B+r!>TX`HT(?bDL^U*jk*EkCL(VE`31MzKo)Sj z17s1myFl*Ywgg1Mtpuy)X~9PBOJV^nkDv!5XhlM()kGg2f_WCmBQVd&pq!WM1-V`X zvI^#S)g0qt_7P}rb84Q)X$-QkRvd$^+zHN1E2S2fV)49Bi`$Xw7F~z&Vz52- z$o2^;qE1-+-F73&eneMDw)HK}pRT(cqYaDf46d9vBJ|k33C25P z#tAyC887gavfRE;&BAS^jLUn6?oLoY9?MRRvN11{2B~<)d^lZM*b}@jzt5XE^Gy+l z#3W7OqzUyntrNOe$GW{yh%q%zcV}RCcd$#959=bg&7o*VHo-cNtfP!Zq03llER0ic z=;9<$Iw*zuB<)ls?s+3YGd_bnYijwO)~GO1I;q4`DuMASyslK+I-f;AZM7_MU<-Ii zS|lZvy+Z%s7S4k%x*CM2mUf~ZTl{~-A^n7{&)MBE`Mzw*mfA00WSOlTq#uR<5S|n# zd*vWr#-!OYs?CPZE~4l(Cdw}BIih(mJ+g?{g|TAN8OPe&W1n1}N2J!+s5Ug7i>1g= zHq^Q%fiMWT1U7Z8ErT2QRCc92v{YT+YPKs}yal*H*LM2>iy7WDbwhHltlVFfK&#m{ zq}_yW+mXxJo3Um4LO8S;!#P1L9J3CQUMQQ4hAJ0RF5*;oJjb;~^S_TNFpJ;nki&%4 z9pCXHuSWeI?~g^i`T=|5S9m{zA12P(sM?T%d%DnO)J=)yG(T)*d_fCk%8Njbj$X7RwH(JA}mQ_)%sSc-rB>V_2Efwoe zH8gAOH(4jd-eX)m-QI2)miD1lZO4oit!AkFWP(s@wdR)9*4Epa{)S&kZjDzy)7-jA!)34I)D61F=`-V18W63;c1AP#G)u8CPA z4|TQLkO$$Ku9e%GVZGC0r;IS7T;#Q)t!-{_F&L!>TE!BbqRYo*wV@k$i+4D}blLj# zYNb-sw$!$k296&^-gdKTSexxyx!G8kW)A|#mtAOR^;Qj|sq+&^x211Xg|J!@eMwSL z4OJMfb1@r4daSgOt@moJiufjuQek6FZES3+8>qZl(PH`4x@MV892mlX91B);`AK7R zs4d@b$f+VQhRJ0p3`}5Im@92UAMvf&q5FP5nwkUta0g?c{>>+?8z#);|Dl|m`BS8!l4WPI^=wOB>R}y9JF0nhT zn_lx5d+fg`a&BjqWbGsf5DHxF4ByPYc{{uPe-6Tr&;I%?gZ2sO|2e(xZyIudC5-{( zJtzZEJy`Z2V7m`xAJhPr15iU)4jbiB8&LyV>>G8Z#ArsZ86zWgIql*`S-SGCTVU9+rD`ZN+R@?4}^ z6sj^7=R&NkQ9`{>(yD5mckti0cwaIVaHm2FC2MLYmyai>ZDkvyrg5qeFzJpXUz!x2&H5>7Lnea7irXJwridQC$36}h~O zHnh{|+>0ZK3~do(<#Z-it(@~lvSv$YFZ3#6e#hx^FSz7|SCz~D{BzW(xnPw&?OOoa;%YHqKXd=IXqLC> z=LKtn408oaKjGFvzD(a_Vd0on%j%e;4(6AF62M_3_U;iXH L3HF0W!FR!b;s>#7 diff --git a/ntt_tool/wsgi.pyc b/ntt_tool/wsgi.pyc deleted file mode 100644 index aa2bea456337b81ae7d4b35fe84f7c06cdb01004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmYjO!EO^V5OsFj6fGbXfjIk^1FXdn1PD;u5Co}23P`y)WX~m@kCY_madjd>|`L)gy?14;TkF` zi(*0&zO@)3N?L*JGmQ7k`5b^(cj$z7C7=i!lz0L6-^jn9;_SjEz=O{no&Q-zI!pq`XZ)e0{Nm4(*h zWdniKMXa4F+;3jf(STc|2MjfkP7!@W3_aw)(Yx2v@u{92pPfyn!&Cq5V=st(Lth1pf#(~nliRA(jjlX!m{GV%2eqi`})fewywiK1v{9^!qRL!(QQ87 zP%}#R|3iGsNA9ix72q8GCMpb2dE8jtmr|^+pH;GUL(}agtuXvM?;fLM=Pf3C-cRXe PvSWf_b|*W`?q`1h41=?5 From c3e23172c255cee79115f390a084fa2e2c5b8f29 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Thu, 3 Mar 2016 18:23:54 +0530 Subject: [PATCH 13/57] DB/Model Redesigned, Views/Serializer redesigned according to DB and cloud module refactorization --- .idea/workspace.xml | 464 ++++++++++-------- .../apps/cloud/migrations/0001_initial.py | 73 +++ ntt_tool/apps/cloud/models.py | 28 +- ntt_tool/apps/cloud/serializers.py | 11 +- ntt_tool/apps/cloud/urls.py | 7 +- ntt_tool/apps/cloud/views.py | 39 +- ntt_tool/static/css/custom.css | 10 +- ntt_tool/static/js/apps/app.js | 38 +- ntt_tool/static/js/apps/auth.js | 2 +- .../js/apps/controllers/cloudcontroller.js | 143 ++++-- .../apps/controllers/cloudtenantcontroller.js | 18 + .../js/apps/controllers/maincontroller.js | 2 +- .../static/js/apps/services/cloudservice.js | 22 +- .../js/apps/services/cloudtenantservice.js | 26 + .../cloud/{cloud.html => cloud_form.html} | 17 +- .../cloud/{clouds.html => cloud_list.html} | 12 +- .../static/partials/cloud/cloud_view.html | 47 +- .../tenants/cloud_tenants_discovery.html | 24 + .../cloud/tenants/cloud_tenants_list.html | 20 + .../{ => traffic}/cloudtraffic_form.html | 2 +- .../cloud/traffic/cloudtraffic_list.html | 34 ++ .../{ => traffic}/cloudtraffic_test.html | 0 .../{ => traffic}/cloudtraffic_view.html | 0 ntt_tool/templates/base.html | 2 + 24 files changed, 674 insertions(+), 367 deletions(-) create mode 100644 ntt_tool/apps/cloud/migrations/0001_initial.py create mode 100644 ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js create mode 100644 ntt_tool/static/js/apps/services/cloudtenantservice.js rename ntt_tool/static/partials/cloud/{cloud.html => cloud_form.html} (71%) rename ntt_tool/static/partials/cloud/{clouds.html => cloud_list.html} (74%) create mode 100644 ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html create mode 100644 ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html rename ntt_tool/static/partials/cloud/{ => traffic}/cloudtraffic_form.html (97%) create mode 100644 ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html rename ntt_tool/static/partials/cloud/{ => traffic}/cloudtraffic_test.html (100%) rename ntt_tool/static/partials/cloud/{ => traffic}/cloudtraffic_view.html (100%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68939b6..84a85a0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,29 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -28,22 +49,24 @@ - - + + - - + + - - + + - - + + + + @@ -51,70 +74,38 @@ - - + + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -127,8 +118,8 @@ @@ -138,14 +129,6 @@ @@ -369,6 +361,36 @@ - - - + + + + + @@ -841,7 +891,7 @@ - + @@ -896,7 +946,7 @@ file://$PROJECT_DIR$/ntt_tool/static/js/apps/controllers/cloudcontroller.js - 25 + 47 @@ -905,48 +955,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1024,13 +1032,6 @@ - - - - - - - @@ -1073,13 +1074,6 @@ - - - - - - - @@ -1087,20 +1081,6 @@ - - - - - - - - - - - - - - @@ -1129,148 +1109,230 @@ - + - - + + - + - - + + + - + - - + + - + - - + + + - + - + + - - + + - + - - + + + - + - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - + + + - + + + + + + + + + - + + + + + + + + + + + - + - + - + - - + + - + - - + + diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.py b/ntt_tool/apps/cloud/migrations/0001_initial.py new file mode 100644 index 0000000..c8d13bd --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0001_initial.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-03 07:19 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Cloud', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('keystone_auth_url', models.CharField(max_length=2083)), + ('keystone_user', models.CharField(max_length=100)), + ('keystone_password', models.CharField(max_length=250)), + ('keystone_tenant_name', models.CharField(max_length=100)), + ('created_on', models.DateTimeField(auto_now=True)), + ('updated_on', models.DateTimeField(auto_now_add=True)), + ('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'db_table': 'cloud_details', + }, + ), + migrations.CreateModel( + name='CloudTraffic', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('allowed_delta_percentage', models.FloatField()), + ('test_result_path', models.CharField(max_length=250)), + ('number_of_workers', models.IntegerField()), + ('remote_user', models.CharField(max_length=100)), + ('remote_pass', models.CharField(max_length=100)), + ('test_method', models.CharField(max_length=100)), + ('iperf_duration', models.IntegerField()), + ('tenant_type', models.CharField(choices=[('all', 'All'), ('intra-tenant', 'Intra Tenant'), ('inter-tenant', 'Inter Tenant'), ('south-north', 'South to North'), ('north-south', 'North to South')], default='all', max_length=20)), + ('external_host', models.CharField(blank=True, max_length=100, null=True)), + ('created_on', models.DateTimeField(auto_now=True)), + ('updated_on', models.DateTimeField(auto_now_add=True)), + ('cloud', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cloud.Cloud')), + ], + options={ + 'db_table': 'cloud_traffic', + }, + ), + migrations.CreateModel( + name='CloudTrafficTenants', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('tenant_name', models.CharField(max_length=256)), + ('ssh_gateway', models.CharField(blank=True, max_length=256, null=True)), + ('created_on', models.DateTimeField(auto_now=True)), + ('updated_on', models.DateTimeField(auto_now_add=True)), + ('cloud_traffic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloud_traffic_tenants', to='cloud.CloudTraffic')), + ('creator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloud_traffic_tenants_creator', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'db_table': 'cloud_traffic_tenants', + }, + ), + ] diff --git a/ntt_tool/apps/cloud/models.py b/ntt_tool/apps/cloud/models.py index 5835eb2..7f4e6dc 100644 --- a/ntt_tool/apps/cloud/models.py +++ b/ntt_tool/apps/cloud/models.py @@ -9,7 +9,7 @@ class Cloud(models.Model): keystone_user = models.CharField(max_length=100) keystone_password = models.CharField(max_length=250) keystone_tenant_name = models.CharField(max_length=100) - # creator = models.ForeignKey(User) #ToDo: Facing some issues in serializer validation + creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -17,6 +17,18 @@ class Meta: db_table = "cloud_details" +class CloudTenants(models.Model): + cloud = models.ForeignKey(Cloud, blank=True, null=True, related_name="cloud_tenants") + tenant_name = models.CharField(max_length=256) + ssh_gateway = models.CharField(max_length=256, blank=True, null=True) + creator = models.ForeignKey(User, blank=True, null=True) + created_on = models.DateTimeField(auto_now=True) + updated_on = models.DateTimeField(auto_now_add=True) + + class Meta: + db_table = "cloud_tenants" + + class CloudTraffic(models.Model): TYPE_CHOICES = ( ('all', 'All'), @@ -27,7 +39,7 @@ class CloudTraffic(models.Model): ) name = models.CharField(max_length=256) - cloud = models.ForeignKey(Cloud) + cloud_tenant = models.ForeignKey(CloudTenants, related_name="cloud_tenant_traffic") allowed_delta_percentage = models.FloatField() test_result_path = models.CharField(max_length=250) number_of_workers = models.IntegerField() @@ -37,7 +49,7 @@ class CloudTraffic(models.Model): iperf_duration = models.IntegerField() tenant_type = models.CharField(max_length=20, choices=TYPE_CHOICES, default='all') external_host = models.CharField(max_length=100, blank=True, null=True) - # creator = models.ForeignKey(User) + creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -45,13 +57,3 @@ class Meta: db_table = "cloud_traffic" -class CloudTrafficTenants(models.Model): - cloud_traffic = models.ForeignKey(CloudTraffic, related_name="cloud_traffic_tenants") - tenant_name = models.CharField(max_length=256) - ssh_gateway = models.CharField(max_length=256, blank=True, null=True) - creator = models.ForeignKey(User, related_name="cloud_traffic_tenants_creator") - created_on = models.DateTimeField(auto_now=True) - updated_on = models.DateTimeField(auto_now_add=True) - - class Meta: - db_table = "cloud_traffic_tenants" diff --git a/ntt_tool/apps/cloud/serializers.py b/ntt_tool/apps/cloud/serializers.py index edbd1b7..f8bb6c8 100644 --- a/ntt_tool/apps/cloud/serializers.py +++ b/ntt_tool/apps/cloud/serializers.py @@ -9,18 +9,18 @@ class Meta: exclude = ('updated_on',) -class CloudTrafficListSerializer(serializers.ModelSerializer): +class CloudTenantsSerializer(serializers.ModelSerializer): class Meta: - model = CloudTraffic + model = CloudTenants class CloudTrafficRetrieveSerializer(serializers.ModelSerializer): class Meta: model = CloudTraffic - depth = 1 exclude = ('created_on', 'updated_on') + depth = 1 class CloudTrafficSerializer(serializers.ModelSerializer): @@ -29,10 +29,5 @@ class Meta: model = CloudTraffic -class CloudTrafficTenantSerializer(serializers.ModelSerializer): - - class Meta: - model = CloudTrafficTenants - diff --git a/ntt_tool/apps/cloud/urls.py b/ntt_tool/apps/cloud/urls.py index 91db229..35d49b4 100644 --- a/ntt_tool/apps/cloud/urls.py +++ b/ntt_tool/apps/cloud/urls.py @@ -4,10 +4,9 @@ router = routers.SimpleRouter() router.register(r'cloud', CloudViewSet) +router.register(r'cloudtenants', CloudTenantsViewSet) router.register(r'cloudtraffic', CloudTrafficViewSet) -router.register(r'cloudtraffictenant', CloudTrafficTenantsViewSet) -urlpatterns = [ - # url('^cloudtraffics/(?P.+)/$', CloudTrafficListView.as_view()), -] + +urlpatterns = [] urlpatterns += router.urls diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index 56c4b43..a98d8bc 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -1,5 +1,6 @@ from rest_framework import viewsets from rest_framework import status +from rest_framework.decorators import list_route from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework_jwt.authentication import JSONWebTokenAuthentication @@ -13,16 +14,19 @@ class CloudViewSet(viewsets.ModelViewSet): authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) + def perform_create(self, serializer): + serializer.save(creator=self.request.user) -class CloudTrafficViewSet(viewsets.ModelViewSet): - queryset = CloudTraffic.objects.all() - serializer_class = CloudTrafficSerializer + +class CloudTenantsViewSet(viewsets.ModelViewSet): + queryset = CloudTenants.objects.all() + serializer_class = CloudTenantsSerializer authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) def list(self, request, *args, **kwargs): cloud_id = self.request.GET.get("cloud_id") - queryset = self.filter_queryset(CloudTraffic.objects.filter(cloud_id=cloud_id)) + queryset = self.filter_queryset(CloudTenants.objects.filter(cloud_id=cloud_id)) page = self.paginate_queryset(queryset) if page is not None: @@ -32,17 +36,20 @@ def list(self, request, *args, **kwargs): serializer = self.get_serializer(queryset, many=True) return Response(serializer.data) + @list_route(methods=["get"], url_path="discover/(?P[^/.]+)") + def discover(self, request, cloud_id=None): + return Response("I am called") + -class CloudTrafficTenantsViewSet(viewsets.ModelViewSet): - queryset = CloudTrafficTenants.objects.all() - serializer_class = CloudTrafficTenantSerializer +class CloudTrafficViewSet(viewsets.ModelViewSet): + queryset = CloudTraffic.objects.all() + serializer_class = CloudTrafficSerializer authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) def list(self, request, *args, **kwargs): - traffic_id = self.request.GET.get("traffic_id") - queryset = self.filter_queryset( - CloudTrafficTenants.objects.filter(cloud_traffic_id=traffic_id)) + cloud_id = self.request.GET.get("cloud_id") + queryset = self.filter_queryset(CloudTraffic.objects.filter(cloud_id=cloud_id)) page = self.paginate_queryset(queryset) if page is not None: @@ -52,15 +59,5 @@ def list(self, request, *args, **kwargs): serializer = self.get_serializer(queryset, many=True) return Response(serializer.data) - def create(self, request, *args, **kwargs): - tenant = CloudTrafficTenants() - tenant.cloud_traffic_id = request.data.get("cloud_traffic_id") - tenant.tenant_name = request.data.get("tenant_name") - tenant.ssh_gateway = request.data.get("ssh_gateway") - tenant.creator = request.user - tenant.save() - - serializer = CloudTrafficTenantSerializer(tenant) - headers = self.get_success_headers(serializer.data) - return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) + diff --git a/ntt_tool/static/css/custom.css b/ntt_tool/static/css/custom.css index 12191b4..68700b1 100644 --- a/ntt_tool/static/css/custom.css +++ b/ntt_tool/static/css/custom.css @@ -85,8 +85,10 @@ td > a{ } .page-header { border-bottom: 1px solid #e4e4e4; - margin: -18px -18px 18px -18px; - padding: 5px 18px; + margin-top: 0; + padding-left: 0; + padding-right: 0; + padding-bottom: 0; } .page-header h1 { color: #666; @@ -130,4 +132,8 @@ td > a{ .panel-heading .btn{ margin-top: 0; +} +.breadcrumb { + padding: 0; + margin: 0; } \ No newline at end of file diff --git a/ntt_tool/static/js/apps/app.js b/ntt_tool/static/js/apps/app.js index 011ff9f..f3e67e3 100644 --- a/ntt_tool/static/js/apps/app.js +++ b/ntt_tool/static/js/apps/app.js @@ -29,24 +29,46 @@ nttApp.config(['$routeProvider', function($routeProvider){ templateUrl: '/static/partials/dashboard.html', }); - $routeProvider.when('/clouds/', { - controller: 'CloudsCtrl', - templateUrl: '/static/partials/cloud/clouds.html', + /** + * URL patterns for cloud + */ + $routeProvider.when('/cloud/', { + controller: 'CloudListCtrl', + templateUrl: '/static/partials/cloud/cloud_list.html', }); - $routeProvider.when('/cloud/:cloudId/', { + $routeProvider.when('/cloud/add/', { controller: 'CloudCtrl', - templateUrl: '/static/partials/cloud/cloud_view.html', + templateUrl: '/static/partials/cloud/cloud_form.html', }); - $routeProvider.when('/clouds/:event/', { + $routeProvider.when('/cloud/edit/:id/', { controller: 'CloudCtrl', - templateUrl: '/static/partials/cloud/cloud.html', + templateUrl: '/static/partials/cloud/cloud_form.html', }); + $routeProvider.when('/cloud/view/:id/', { + controller: 'CloudCtrl', + templateUrl: '/static/partials/cloud/cloud_view.html', + }); + + + /** + * URL patterns for cloud tenants and tenant discovery + */ + $routeProvider.when('/cloud/tenant/discovery/:cloudId/', { + controller: 'CloudTenantDiscoveryCtrl', + templateUrl: '/static/partials/cloud/tenants/cloud_tenants_discovery.html', + }); + + + + + + $routeProvider.when('/clouds/:event/:cloudId/', { controller: 'CloudCtrl', - templateUrl: '/static/partials/cloud/cloud.html', + templateUrl: '/static/partials/cloud/cloud_form.html', }); $routeProvider.when('/cloudtraffic/view/:id/', { diff --git a/ntt_tool/static/js/apps/auth.js b/ntt_tool/static/js/apps/auth.js index 46f066a..7c1b5e5 100644 --- a/ntt_tool/static/js/apps/auth.js +++ b/ntt_tool/static/js/apps/auth.js @@ -9,7 +9,7 @@ nttApp.run(function($rootScope, $window, $location){ $rootScope.isLoggedin = true; $window.localStorage['isLoggedin'] = true; $window.localStorage['token'] = data.token; - $location.path("clouds"); + $location.path("cloud"); }); $rootScope.$on('event:auth-loginRequired', function (event) { diff --git a/ntt_tool/static/js/apps/controllers/cloudcontroller.js b/ntt_tool/static/js/apps/controllers/cloudcontroller.js index 57fd854..bb9a852 100644 --- a/ntt_tool/static/js/apps/controllers/cloudcontroller.js +++ b/ntt_tool/static/js/apps/controllers/cloudcontroller.js @@ -1,60 +1,125 @@ -nttApp.controller('CloudsCtrl', function($scope, cloudService){ - $scope.clouds = []; - $scope.getClouds = function(){ - cloudService.list().then(function(data){ - $scope.clouds = data; - }) - }; - $scope.getClouds(); +/** + * Controller to list all clouds and delete selected cloud + */ +nttApp.controller('CloudListCtrl', function($scope, cloudService){ + $scope.cloudList = []; + + cloudService.list().then(function(data){ + $scope.cloudList = data; + }); $scope.delete = function($index){ if(confirm("Are you sure want to delete?")){ - cloudService.delete($scope.clouds[$index].id).then(function(data){ - $scope.clouds.splice($index, 1); + cloudService.delete($scope.cloudList[$index].id).then(function(data){ + $scope.cloudList.splice($index, 1); }); } }; }); -nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudService, cloudTrafficService){ - $scope.cloudId = $routeParams.cloudId; - $scope.event = $routeParams.event; +nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudService){ + $scope.id = $routeParams.id; + $scope.event = $scope.id == undefined ? "add" : "edit"; $scope.cloud = {}; - $scope.cloudTrafficList = []; - if ($scope.cloudId != undefined){ - cloudService.get($scope.cloudId).then(function(data){ + if($scope.event == "edit"){ + cloudService.get($scope.id).then(function(data){ $scope.cloud = data; }); - - cloudTrafficService.list($scope.cloudId).then(function (data) { - $scope.cloudTrafficList = data; - }) }; $scope.save = function(){ - if ($scope.event == 'add'){ - cloudService.create($scope.cloud).then(function (data) { - $location.path("cloudtraffic/add/"+ data.id +"/"); - }); - } - else { - cloudService.update($scope.cloud.id, $scope.cloud).then(function(data){ - $location.path("cloud/"+$scope.cloud.id+"/"); - }); - }; - + cloudService.create($scope.cloud).then(function(data){ + $location.path("cloud/" + data.id + "/"); + }); }; - - $scope.deleteTraffic = function($index){ - if(confirm("Are you sure want to delete?")) { - cloudTrafficService.delete($scope.cloudTrafficList[$index].id).then(function (data) { - $scope.cloudTrafficList.splice($index, 1); - }); - } - } }); + + + + +//nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudService, cloudTrafficService){ +// $scope.cloudId = $routeParams.cloudId; +// $scope.event = $routeParams.event; +// $scope.cloud = {}; +// $scope.cloudTrafficList = []; +// +// if ($scope.cloudId != undefined){ +// cloudService.get($scope.cloudId).then(function(data){ +// $scope.cloud = data; +// }); +// +// cloudTrafficService.list($scope.cloudId).then(function (data) { +// $scope.cloudTrafficList = data; +// }) +// }; +// +// $scope.save = function(){ +// if ($scope.event == 'add'){ +// cloudService.create($scope.cloud).then(function (data) { +// $location.path("cloudtraffic/add/"+ data.id +"/"); +// }); +// } +// else { +// cloudService.update($scope.cloud.id, $scope.cloud).then(function(data){ +// $location.path("cloud/"+$scope.cloud.id+"/"); +// }); +// }; +// +// }; +// +// $scope.deleteTraffic = function($index){ +// if(confirm("Are you sure want to delete?")) { +// cloudTrafficService.delete($scope.cloudTrafficList[$index].id).then(function (data) { +// $scope.cloudTrafficList.splice($index, 1); +// }); +// } +// } +//}); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js b/ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js new file mode 100644 index 0000000..b58003d --- /dev/null +++ b/ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js @@ -0,0 +1,18 @@ +nttApp.controller('CloudTenantListCtrl', function($scope){ + $scope.tenantList = [ + {'id':1, 'name':'Name 1', 'ip':'ip'}, + {'id':1, 'name':'Name 1', 'ip':'ip'} + ]; +}); + +nttApp.controller('CloudTenantDiscoveryCtrl', function($scope, $routeParams, cloudTenantService){ + $scope.cloudId = $routeParams.cloudId; + $scope.tenantList = []; + + $scope.discover = function(){ + cloudTenantService.discover($scope.cloudId).then(function(data){ + console.log(data); + }); + }; + $scope.discover(); +}); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/controllers/maincontroller.js b/ntt_tool/static/js/apps/controllers/maincontroller.js index ef31ac7..96e9b9e 100644 --- a/ntt_tool/static/js/apps/controllers/maincontroller.js +++ b/ntt_tool/static/js/apps/controllers/maincontroller.js @@ -1,6 +1,6 @@ nttApp.controller('IndexCtrl', function($rootScope, $scope, $location){ if($rootScope.isLoggedin){ - $location.path('clouds'); + $location.path('cloud'); } }); diff --git a/ntt_tool/static/js/apps/services/cloudservice.js b/ntt_tool/static/js/apps/services/cloudservice.js index f34a638..1643c0f 100644 --- a/ntt_tool/static/js/apps/services/cloudservice.js +++ b/ntt_tool/static/js/apps/services/cloudservice.js @@ -16,6 +16,10 @@ nttApp.service('cloudService', function(dataService){ }; }); + + + + nttApp.service('cloudTrafficService', function(dataService){ this.list = function(cloudId){ return dataService.get('/api/cloudtraffic/?cloud_id='+cloudId); @@ -33,21 +37,3 @@ nttApp.service('cloudTrafficService', function(dataService){ return dataService.delete('/api/cloudtraffic/'+pk+'/'); }; }); - -nttApp.service('cloudTrafficTenantService', function(dataService){ - this.list = function(trafficId){ - return dataService.get('/api/cloudtraffictenant/?traffic_id='+trafficId); - }; - this.get = function(trafficId) { - return dataService.get('/api/cloudtraffictenant/'+trafficId+'/'); - }; - this.create = function(params){ - return dataService.post('/api/cloudtraffictenant/', params); - }; - this.update = function(pk, params){ - return dataService.put('/api/cloudtraffictenant/'+pk+'/', params); - }; - this.delete = function(pk){ - return dataService.delete('/api/cloudtraffictenant/'+pk+'/'); - }; -}); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/services/cloudtenantservice.js b/ntt_tool/static/js/apps/services/cloudtenantservice.js new file mode 100644 index 0000000..9796015 --- /dev/null +++ b/ntt_tool/static/js/apps/services/cloudtenantservice.js @@ -0,0 +1,26 @@ +nttApp.service('cloudTenantService', function (dataService) { + this.discover = function(cloudId){ + return dataService.get('/api/cloudtenants/discover/' + cloudId + '/'); + } +}); + + + +// +//nttApp.service('cloudTrafficTenantService', function(dataService){ +// this.list = function(trafficId){ +// return dataService.get('/api/cloudtraffictenant/?traffic_id='+trafficId); +// }; +// this.get = function(trafficId) { +// return dataService.get('/api/cloudtraffictenant/'+trafficId+'/'); +// }; +// this.create = function(params){ +// return dataService.post('/api/cloudtraffictenant/', params); +// }; +// this.update = function(pk, params){ +// return dataService.put('/api/cloudtraffictenant/'+pk+'/', params); +// }; +// this.delete = function(pk){ +// return dataService.delete('/api/cloudtraffictenant/'+pk+'/'); +// }; +//}); \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/cloud.html b/ntt_tool/static/partials/cloud/cloud_form.html similarity index 71% rename from ntt_tool/static/partials/cloud/cloud.html rename to ntt_tool/static/partials/cloud/cloud_form.html index e475fbb..7eb7bcd 100644 --- a/ntt_tool/static/partials/cloud/cloud.html +++ b/ntt_tool/static/partials/cloud/cloud_form.html @@ -4,29 +4,30 @@

{$ event | capitalize:true $} Cloud

-
+
- +
- +
- +
- +
- +
- Cancel - + Cancel + +
diff --git a/ntt_tool/static/partials/cloud/clouds.html b/ntt_tool/static/partials/cloud/cloud_list.html similarity index 74% rename from ntt_tool/static/partials/cloud/clouds.html rename to ntt_tool/static/partials/cloud/cloud_list.html index e73f56f..2a7131b 100644 --- a/ntt_tool/static/partials/cloud/clouds.html +++ b/ntt_tool/static/partials/cloud/cloud_list.html @@ -4,13 +4,13 @@
- + Add Cloud

Clouds

- +
@@ -19,20 +19,20 @@

Clouds

- - + +
Name Keystone Auth URL Created On Actions
{$ cloud.name $}
{$ cloud.name $} {$ cloud.keystone_auth_url $} {$ cloud.keystone_user $} {$ cloud.keystone_tenant_name $} {$ cloud.created_on | date:"MM/dd/yyyy hh:mm a" $} - +
-
Data not found.
+
Data not found.
\ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/cloud_view.html b/ntt_tool/static/partials/cloud/cloud_view.html index 3da289d..a2aae89 100644 --- a/ntt_tool/static/partials/cloud/cloud_view.html +++ b/ntt_tool/static/partials/cloud/cloud_view.html @@ -3,8 +3,16 @@
+
    +
  1. Cloud List
    2. +
  2. Cloud Details
    3. +
+
-
Cloud Details
+
+ Cloud Details + Edit +
@@ -23,41 +31,8 @@
-
-
- - Add Traffic - -

Cloud Traffic

-
- -
Name :
- - - - - - - - - - - - - - - - - - - - - - -
NameAllowed Delta PercentageTest Result PathNumber Of WorkersRemote UserTest MethodIPERF DurationTypeActions
{$ cloudTraffic.name $}{$ cloudTraffic.allowed_delta_percentage $}{$ cloudTraffic.test_result_path $}{$ cloudTraffic.number_of_workers $}{$ cloudTraffic.remote_user $}{$ cloudTraffic.test_method $}{$ cloudTraffic.iperf_duration $}{$ cloudTraffic.tenant_type $} - - -
+
+
\ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html b/ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html new file mode 100644 index 0000000..4fe94cf --- /dev/null +++ b/ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html @@ -0,0 +1,24 @@ + + +
+
+
+
    +
  1. Cloud List
    2. +
  2. Cloud Details
    3. +
  3. Tenant Discovery
    4. +
+
+
+ +
+
+
+

Tenant Discovery

+
+
+
+
+
+
+
\ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html b/ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html new file mode 100644 index 0000000..27def3f --- /dev/null +++ b/ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html @@ -0,0 +1,20 @@ +
+ + Discover Tenants + +

Tenants

+
+ + + + + + + + + + +
NameActions
{$ tenant.name $}-
+ + + diff --git a/ntt_tool/static/partials/cloud/cloudtraffic_form.html b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html similarity index 97% rename from ntt_tool/static/partials/cloud/cloudtraffic_form.html rename to ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html index 59414ad..3a6980a 100644 --- a/ntt_tool/static/partials/cloud/cloudtraffic_form.html +++ b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html @@ -55,7 +55,7 @@

Cloud > Traffic

- Cancel + Cancel
diff --git a/ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html new file mode 100644 index 0000000..f7fdd6f --- /dev/null +++ b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html @@ -0,0 +1,34 @@ +
+ + Add Traffic + +

Cloud Traffic

+
+ + + + + + + + + + + + + + + + + + + + + + + + +
NameAllowed Delta PercentageTest Result PathNumber Of WorkersRemote UserTest MethodIPERF DurationTypeActions
{$ cloudTraffic.name $}{$ cloudTraffic.allowed_delta_percentage $}{$ cloudTraffic.test_result_path $}{$ cloudTraffic.number_of_workers $}{$ cloudTraffic.remote_user $}{$ cloudTraffic.test_method $}{$ cloudTraffic.iperf_duration $}{$ cloudTraffic.tenant_type $} + + +
\ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/cloudtraffic_test.html b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_test.html similarity index 100% rename from ntt_tool/static/partials/cloud/cloudtraffic_test.html rename to ntt_tool/static/partials/cloud/traffic/cloudtraffic_test.html diff --git a/ntt_tool/static/partials/cloud/cloudtraffic_view.html b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_view.html similarity index 100% rename from ntt_tool/static/partials/cloud/cloudtraffic_view.html rename to ntt_tool/static/partials/cloud/traffic/cloudtraffic_view.html diff --git a/ntt_tool/templates/base.html b/ntt_tool/templates/base.html index 41661c1..c0c80e4 100644 --- a/ntt_tool/templates/base.html +++ b/ntt_tool/templates/base.html @@ -22,6 +22,8 @@ + + {% block js %}{% endblock %} From cbbd8fc02985274922bd4c8b565f8148282f72db Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Tue, 8 Mar 2016 10:52:01 +0530 Subject: [PATCH 14/57] Made changes according to change request --- .idea/dataSources.ids | 6 + .idea/dataSources.local.xml | 10 + .idea/dataSources.xml | 11 + .idea/workspace.xml | 568 ++++++++++-------- config.ini | 6 + ntt_tool/apps/cloud/apps.py | 1 + .../apps/cloud/migrations/0001_initial.py | 25 +- ntt_tool/apps/cloud/models.py | 8 +- ntt_tool/apps/cloud/serializers.py | 4 +- .../apps/cloud/tenantdiscoverycontroller.py | 36 ++ ntt_tool/apps/cloud/urls.py | 2 +- ntt_tool/apps/cloud/views.py | 51 +- ntt_tool/settings.py | 1 + ntt_tool/static/js/apps/app.js | 18 +- .../js/apps/controllers/cloudcontroller.js | 2 +- .../apps/controllers/cloudtenantcontroller.js | 18 - .../js/apps/controllers/tenantcontroller.js | 42 ++ .../js/apps/controllers/trafficcontroller.js | 9 + .../static/js/apps/services/tenantservice.js | 11 + ...loudtenantservice.js => trafficservice.js} | 13 +- .../static/js/libs/angular/checklist-model.js | 148 +++++ .../angular/ui-bootstrap-tpls-1.2.4.min.js | 10 + .../static/partials/cloud/cloud_form.html | 22 +- .../static/partials/cloud/cloud_view.html | 50 +- .../tenants/cloud_tenants_discovery.html | 24 - .../cloud/tenants/cloud_tenants_list.html | 20 - .../cloud/tenants/tenants_discovery.html | 55 ++ .../partials/cloud/tenants/tenants_list.html | 23 + .../cloud/traffic/cloudtraffic_form.html | 63 -- .../cloud/traffic/cloudtraffic_list.html | 34 -- .../partials/cloud/traffic/traffic_form.html | 100 +++ .../partials/cloud/traffic/traffic_list.html | 34 ++ ntt_tool/static/partials/common/header.html | 4 +- ntt_tool/templates/base.html | 8 +- ntt_tool/utils/__init__.py | 0 ntt_tool/utils/custom_exception_handler.py | 13 + 36 files changed, 959 insertions(+), 491 deletions(-) create mode 100644 .idea/dataSources.ids create mode 100644 .idea/dataSources.local.xml create mode 100644 .idea/dataSources.xml create mode 100644 config.ini create mode 100644 ntt_tool/apps/cloud/tenantdiscoverycontroller.py delete mode 100644 ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js create mode 100644 ntt_tool/static/js/apps/controllers/tenantcontroller.js create mode 100644 ntt_tool/static/js/apps/controllers/trafficcontroller.js create mode 100644 ntt_tool/static/js/apps/services/tenantservice.js rename ntt_tool/static/js/apps/services/{cloudtenantservice.js => trafficservice.js} (69%) create mode 100644 ntt_tool/static/js/libs/angular/checklist-model.js create mode 100644 ntt_tool/static/js/libs/angular/ui-bootstrap-tpls-1.2.4.min.js delete mode 100644 ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html delete mode 100644 ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html create mode 100644 ntt_tool/static/partials/cloud/tenants/tenants_discovery.html create mode 100644 ntt_tool/static/partials/cloud/tenants/tenants_list.html delete mode 100644 ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html delete mode 100644 ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html create mode 100644 ntt_tool/static/partials/cloud/traffic/traffic_form.html create mode 100644 ntt_tool/static/partials/cloud/traffic/traffic_list.html create mode 100644 ntt_tool/utils/__init__.py create mode 100644 ntt_tool/utils/custom_exception_handler.py diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids new file mode 100644 index 0000000..58cd68d --- /dev/null +++ b/.idea/dataSources.ids @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml new file mode 100644 index 0000000..2515303 --- /dev/null +++ b/.idea/dataSources.local.xml @@ -0,0 +1,10 @@ + + + + + memory + true + magpaqnujuklfc + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..b5a82e1 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,11 @@ + + + + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://ec2-54-83-18-87.compute-1.amazonaws.com:5432/dcv14dl16ev288 + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 84a85a0..d1428e2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,33 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + @@ -40,6 +45,19 @@ + + @@ -49,21 +67,11 @@ - - - - - - - - - - - + @@ -71,21 +79,61 @@ - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -95,17 +143,27 @@ - + - - + + - - + + + + + + + + + + + + @@ -116,10 +174,10 @@ @@ -129,19 +187,6 @@ @@ -219,6 +277,8 @@ + + @@ -387,7 +447,7 @@ @@ -409,7 +469,15 @@ - - @@ -605,15 +641,15 @@ + + + + - - - - @@ -888,42 +924,42 @@ - - + + - + + - - - + + - + - + - + - + - + - + @@ -955,384 +991,390 @@ - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - + - + - - + + - + + + + + + + + - + - + - - + + + - + - - - + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + + - + - - + + - + - - + + + + - + - + - + - - - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - - - + + - + - - + + - + - - + + - + - - + + - + - - + + diff --git a/config.ini b/config.ini new file mode 100644 index 0000000..c2c6b89 --- /dev/null +++ b/config.ini @@ -0,0 +1,6 @@ +[DEFAULT] +keystone_auth_url = http://openstack.org/keystone/auth/url +keystone_user = admin +keystone_password = admin123 +keystone_tenant_name = Test + diff --git a/ntt_tool/apps/cloud/apps.py b/ntt_tool/apps/cloud/apps.py index f9da1d3..6f2b436 100644 --- a/ntt_tool/apps/cloud/apps.py +++ b/ntt_tool/apps/cloud/apps.py @@ -5,3 +5,4 @@ class CloudConfig(AppConfig): name = 'cloudtraffic' + diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.py b/ntt_tool/apps/cloud/migrations/0001_initial.py index c8d13bd..994f287 100644 --- a/ntt_tool/apps/cloud/migrations/0001_initial.py +++ b/ntt_tool/apps/cloud/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-03 07:19 +# Generated by Django 1.9.2 on 2016-03-07 09:19 from __future__ import unicode_literals from django.conf import settings @@ -49,25 +49,36 @@ class Migration(migrations.Migration): ('external_host', models.CharField(blank=True, max_length=100, null=True)), ('created_on', models.DateTimeField(auto_now=True)), ('updated_on', models.DateTimeField(auto_now_add=True)), - ('cloud', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cloud.Cloud')), ], options={ 'db_table': 'cloud_traffic', }, ), migrations.CreateModel( - name='CloudTrafficTenants', + name='Tenants', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('tenant_name', models.CharField(max_length=256)), - ('ssh_gateway', models.CharField(blank=True, max_length=256, null=True)), + ('router_name', models.CharField(max_length=256)), + ('network_name', models.CharField(max_length=256)), + ('network_CIDR', models.CharField(max_length=256)), ('created_on', models.DateTimeField(auto_now=True)), ('updated_on', models.DateTimeField(auto_now_add=True)), - ('cloud_traffic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloud_traffic_tenants', to='cloud.CloudTraffic')), - ('creator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloud_traffic_tenants_creator', to=settings.AUTH_USER_MODEL)), + ('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cloud_tenants', to='cloud.Cloud')), + ('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ - 'db_table': 'cloud_traffic_tenants', + 'db_table': 'cloud_tenants', }, ), + migrations.AddField( + model_name='cloudtraffic', + name='cloud_tenant', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloud_tenant_traffic', to='cloud.Tenants'), + ), + migrations.AddField( + model_name='cloudtraffic', + name='creator', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), ] diff --git a/ntt_tool/apps/cloud/models.py b/ntt_tool/apps/cloud/models.py index 7f4e6dc..05f197d 100644 --- a/ntt_tool/apps/cloud/models.py +++ b/ntt_tool/apps/cloud/models.py @@ -17,10 +17,12 @@ class Meta: db_table = "cloud_details" -class CloudTenants(models.Model): +class Tenants(models.Model): cloud = models.ForeignKey(Cloud, blank=True, null=True, related_name="cloud_tenants") tenant_name = models.CharField(max_length=256) - ssh_gateway = models.CharField(max_length=256, blank=True, null=True) + router_name = models.CharField(max_length=256) + network_name = models.CharField(max_length=256) + network_CIDR = models.CharField(max_length=256) creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -39,7 +41,7 @@ class CloudTraffic(models.Model): ) name = models.CharField(max_length=256) - cloud_tenant = models.ForeignKey(CloudTenants, related_name="cloud_tenant_traffic") + cloud_tenant = models.ForeignKey(Tenants, related_name="cloud_tenant_traffic") allowed_delta_percentage = models.FloatField() test_result_path = models.CharField(max_length=250) number_of_workers = models.IntegerField() diff --git a/ntt_tool/apps/cloud/serializers.py b/ntt_tool/apps/cloud/serializers.py index f8bb6c8..44c385c 100644 --- a/ntt_tool/apps/cloud/serializers.py +++ b/ntt_tool/apps/cloud/serializers.py @@ -9,10 +9,10 @@ class Meta: exclude = ('updated_on',) -class CloudTenantsSerializer(serializers.ModelSerializer): +class TenantSerializer(serializers.ModelSerializer): class Meta: - model = CloudTenants + model = Tenants class CloudTrafficRetrieveSerializer(serializers.ModelSerializer): diff --git a/ntt_tool/apps/cloud/tenantdiscoverycontroller.py b/ntt_tool/apps/cloud/tenantdiscoverycontroller.py new file mode 100644 index 0000000..9871c45 --- /dev/null +++ b/ntt_tool/apps/cloud/tenantdiscoverycontroller.py @@ -0,0 +1,36 @@ +import ConfigParser +from models import Cloud + + +class TenantDiscoveryController(object): + + def generate_config(self, cloud_id): + """ + Function to generate config.ini file which is used as a input to + tenant discovery script + :return: True if success else False + """ + config = ConfigParser.ConfigParser() + try: + cloud = Cloud.objects.get(pk=cloud_id) + config.set(ConfigParser.DEFAULTSECT, "keystone_auth_url", cloud.keystone_auth_url) + config.set(ConfigParser.DEFAULTSECT, "keystone_user", cloud.keystone_user) + config.set(ConfigParser.DEFAULTSECT, "keystone_password", cloud.keystone_password) + config.set(ConfigParser.DEFAULTSECT, "keystone_tenant_name", cloud.keystone_tenant_name) + except Cloud.DoesNotExist: + return False + + with open('config.ini', 'wb') as f: + config.write(f) + + return True + + def discover_tenants(self, cloud_id): + self.generate_config(cloud_id) + return [] + + + + + + diff --git a/ntt_tool/apps/cloud/urls.py b/ntt_tool/apps/cloud/urls.py index 35d49b4..12385f8 100644 --- a/ntt_tool/apps/cloud/urls.py +++ b/ntt_tool/apps/cloud/urls.py @@ -4,7 +4,7 @@ router = routers.SimpleRouter() router.register(r'cloud', CloudViewSet) -router.register(r'cloudtenants', CloudTenantsViewSet) +router.register(r'tenant', TenantViewSet) router.register(r'cloudtraffic', CloudTrafficViewSet) diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index a98d8bc..7da8a1e 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -1,6 +1,6 @@ from rest_framework import viewsets from rest_framework import status -from rest_framework.decorators import list_route +from rest_framework.decorators import list_route, detail_route from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework_jwt.authentication import JSONWebTokenAuthentication @@ -18,15 +18,16 @@ def perform_create(self, serializer): serializer.save(creator=self.request.user) -class CloudTenantsViewSet(viewsets.ModelViewSet): - queryset = CloudTenants.objects.all() - serializer_class = CloudTenantsSerializer +class TenantViewSet(viewsets.ModelViewSet): + queryset = Tenants.objects.all() + serializer_class = TenantSerializer authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) def list(self, request, *args, **kwargs): cloud_id = self.request.GET.get("cloud_id") - queryset = self.filter_queryset(CloudTenants.objects.filter(cloud_id=cloud_id)) + queryset = self.filter_queryset( + Tenants.objects.filter(cloud_id=cloud_id)) page = self.paginate_queryset(queryset) if page is not None: @@ -38,7 +39,42 @@ def list(self, request, *args, **kwargs): @list_route(methods=["get"], url_path="discover/(?P[^/.]+)") def discover(self, request, cloud_id=None): - return Response("I am called") + response = { + "total_tenants": 10, + "total_routers": 10, + "total_networks": 10, + "total_vm": 10, + "tenants": [ + {"id": 1, + "name": "tenant-test-101", + "router_name": "tenant-test-101-router", + "network_name": "tenant-test-101-net-1", + "network_cidr": "1.1.1.0/24"}, + {"id": 2, + "name": "tenant-test-102", + "router_name": "tenant-test-102-router", + "network_name": "tenant-test-101-net-1", + "network_cidr": "1.1.1.0/24"}, + {"id": 3, + "name": "tenant-test-103", + "router_name": "tenant-test-103-router", + "network_name": "tenant-test-101-net-1", + "network_cidr": "2.2.2.0/24"}, + ] + } + + import time + time.sleep(1) + return Response(response) + + # def create(self, request, *args, **kwargs): + # import pdb + # pdb.set_trace() + # serializer = self.get_serializer(data=request.data) + # serializer.is_valid(raise_exception=True) + # self.perform_create(serializer) + # headers = self.get_success_headers(serializer.data) + # return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) class CloudTrafficViewSet(viewsets.ModelViewSet): @@ -49,7 +85,8 @@ class CloudTrafficViewSet(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): cloud_id = self.request.GET.get("cloud_id") - queryset = self.filter_queryset(CloudTraffic.objects.filter(cloud_id=cloud_id)) + queryset = self.filter_queryset( + CloudTraffic.objects.filter(cloud_id=cloud_id)) page = self.paginate_queryset(queryset) if page is not None: diff --git a/ntt_tool/settings.py b/ntt_tool/settings.py index a4facaf..da11487 100644 --- a/ntt_tool/settings.py +++ b/ntt_tool/settings.py @@ -141,6 +141,7 @@ # 'rest_framework.authentication.BasicAuthentication', 'rest_framework_jwt.authentication.JSONWebTokenAuthentication', ], + 'EXCEPTION_HANDLER': 'ntt_tool.utils.custom_exception_handler.custom_exception_handler', 'PAGINATE_BY': 10, } diff --git a/ntt_tool/static/js/apps/app.js b/ntt_tool/static/js/apps/app.js index f3e67e3..9685210 100644 --- a/ntt_tool/static/js/apps/app.js +++ b/ntt_tool/static/js/apps/app.js @@ -2,6 +2,8 @@ var nttApp = angular.module('nttApp', [ 'ngRoute', 'ngCookies', 'http-auth-interceptor', + 'ui.bootstrap', + 'checklist-model', ]); nttApp.config(['$httpProvider', '$interpolateProvider', function($httpProvider, $interpolateProvider){ @@ -57,12 +59,18 @@ nttApp.config(['$routeProvider', function($routeProvider){ * URL patterns for cloud tenants and tenant discovery */ $routeProvider.when('/cloud/tenant/discovery/:cloudId/', { - controller: 'CloudTenantDiscoveryCtrl', - templateUrl: '/static/partials/cloud/tenants/cloud_tenants_discovery.html', + controller: 'TenantDiscoveryCtrl', + templateUrl: '/static/partials/cloud/tenants/tenants_discovery.html', }); - + /** + * URL patterns for cloud traffic + */ + $routeProvider.when('/cloud/traffic/add/:cloudId/', { + controller: 'TrafficCtrl', + templateUrl: '/static/partials/cloud/traffic/traffic_form.html' + }); @@ -78,12 +86,12 @@ nttApp.config(['$routeProvider', function($routeProvider){ $routeProvider.when('/cloudtraffic/:event/:cloudId/', { controller: 'CloudTrafficCtrl', - templateUrl: '/static/partials/cloud/cloudtraffic_form.html', + templateUrl: '/static/partials/cloud/traffic_form.html', }); $routeProvider.when('/cloudtraffic/:event/:cloudId/:trafficId/', { controller: 'CloudTrafficCtrl', - templateUrl: '/static/partials/cloud/cloudtraffic_form.html', + templateUrl: '/static/partials/cloud/traffic_form.html', }); $routeProvider.when('/cloudtraffictest/', { diff --git a/ntt_tool/static/js/apps/controllers/cloudcontroller.js b/ntt_tool/static/js/apps/controllers/cloudcontroller.js index bb9a852..40e2ded 100644 --- a/ntt_tool/static/js/apps/controllers/cloudcontroller.js +++ b/ntt_tool/static/js/apps/controllers/cloudcontroller.js @@ -31,7 +31,7 @@ nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudSe $scope.save = function(){ cloudService.create($scope.cloud).then(function(data){ - $location.path("cloud/" + data.id + "/"); + $location.path("cloud/view/" + data.id + "/"); }); }; }); diff --git a/ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js b/ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js deleted file mode 100644 index b58003d..0000000 --- a/ntt_tool/static/js/apps/controllers/cloudtenantcontroller.js +++ /dev/null @@ -1,18 +0,0 @@ -nttApp.controller('CloudTenantListCtrl', function($scope){ - $scope.tenantList = [ - {'id':1, 'name':'Name 1', 'ip':'ip'}, - {'id':1, 'name':'Name 1', 'ip':'ip'} - ]; -}); - -nttApp.controller('CloudTenantDiscoveryCtrl', function($scope, $routeParams, cloudTenantService){ - $scope.cloudId = $routeParams.cloudId; - $scope.tenantList = []; - - $scope.discover = function(){ - cloudTenantService.discover($scope.cloudId).then(function(data){ - console.log(data); - }); - }; - $scope.discover(); -}); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/controllers/tenantcontroller.js b/ntt_tool/static/js/apps/controllers/tenantcontroller.js new file mode 100644 index 0000000..b341cf3 --- /dev/null +++ b/ntt_tool/static/js/apps/controllers/tenantcontroller.js @@ -0,0 +1,42 @@ +nttApp.controller('TenantListCtrl', function($scope, tenantService){ + $scope.tenants = [ + {"id": 1, "name": "tenant-test-101", "router_name": "tenant-test-101-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, + {"id": 2, "name": "tenant-test-102", "router_name": "tenant-test-102-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, + {"id": 3, "name": "tenant-test-103", "router_name": "tenant-test-103-router", "network_name": "tenant-test-101-net-1", "network_cidr": "2.2.2.0/24"}, + ] + +}); + +nttApp.controller('TenantDiscoveryCtrl', function($scope, $routeParams, tenantService){ + $scope.cloudId = $routeParams.cloudId; + $scope.discoveryResult = {}; + + $scope.showLoading = true; + $scope.discover = function(){ + tenantService.discover($scope.cloudId).then(function(data){ + $scope.showLoading = false; + $scope.discoveryResult = { + "total_tenants": 10, + "total_routers": 10, + "total_networks": 10, + "total_vm": 10, + "tenants": [ + {"id": 1, "name": "tenant-test-101", "router_name": "tenant-test-101-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, + {"id": 2, "name": "tenant-test-102", "router_name": "tenant-test-102-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, + {"id": 3, "name": "tenant-test-103", "router_name": "tenant-test-103-router", "network_name": "tenant-test-101-net-1", "network_cidr": "2.2.2.0/24"}, + ] + }; + }); + }; + $scope.discover(); + + $scope.selectedResult = { + "cloud_id": $scope.cloudId, + "tenants": [], + }; + $scope.saveTenants = function () { + tenantService.save($scope.selectedResult).then(function(data){ + console.log("Hey") + }); + }; +}); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/controllers/trafficcontroller.js b/ntt_tool/static/js/apps/controllers/trafficcontroller.js new file mode 100644 index 0000000..3fbf08c --- /dev/null +++ b/ntt_tool/static/js/apps/controllers/trafficcontroller.js @@ -0,0 +1,9 @@ +nttApp.controller('TrafficListCtrl', function($scope, trafficService){ + +}); + +nttApp.controller('TrafficCtrl', function($scope, $routeParams, trafficService){ + $scope.cloudId = $routeParams.cloudId; + $scope.event = $scope.id == undefined ? "add" : "edit"; + $scope.traffic = {}; +}); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/services/tenantservice.js b/ntt_tool/static/js/apps/services/tenantservice.js new file mode 100644 index 0000000..92ba0ad --- /dev/null +++ b/ntt_tool/static/js/apps/services/tenantservice.js @@ -0,0 +1,11 @@ +nttApp.service('tenantService', function (dataService) { + this.discover = function(cloudId){ + return dataService.get('/api/tenant/discover/' + cloudId + '/'); + }; + + this.save = function(params){ + return dataService.post('/api/tenant/', params); + }; +}); + + diff --git a/ntt_tool/static/js/apps/services/cloudtenantservice.js b/ntt_tool/static/js/apps/services/trafficservice.js similarity index 69% rename from ntt_tool/static/js/apps/services/cloudtenantservice.js rename to ntt_tool/static/js/apps/services/trafficservice.js index 9796015..0ded8b2 100644 --- a/ntt_tool/static/js/apps/services/cloudtenantservice.js +++ b/ntt_tool/static/js/apps/services/trafficservice.js @@ -1,13 +1,4 @@ -nttApp.service('cloudTenantService', function (dataService) { - this.discover = function(cloudId){ - return dataService.get('/api/cloudtenants/discover/' + cloudId + '/'); - } -}); - - - -// -//nttApp.service('cloudTrafficTenantService', function(dataService){ +nttApp.service('trafficService', function(dataService){ // this.list = function(trafficId){ // return dataService.get('/api/cloudtraffictenant/?traffic_id='+trafficId); // }; @@ -23,4 +14,4 @@ nttApp.service('cloudTenantService', function (dataService) { // this.delete = function(pk){ // return dataService.delete('/api/cloudtraffictenant/'+pk+'/'); // }; -//}); \ No newline at end of file +}); \ No newline at end of file diff --git a/ntt_tool/static/js/libs/angular/checklist-model.js b/ntt_tool/static/js/libs/angular/checklist-model.js new file mode 100644 index 0000000..391d831 --- /dev/null +++ b/ntt_tool/static/js/libs/angular/checklist-model.js @@ -0,0 +1,148 @@ +/** + * Checklist-model + * AngularJS directive for list of checkboxes + * https://github.com/vitalets/checklist-model + * License: MIT http://opensource.org/licenses/MIT + */ + +angular.module('checklist-model', []) +.directive('checklistModel', ['$parse', '$compile', function($parse, $compile) { + // contains + function contains(arr, item, comparator) { + if (angular.isArray(arr)) { + for (var i = arr.length; i--;) { + if (comparator(arr[i], item)) { + return true; + } + } + } + return false; + } + + // add + function add(arr, item, comparator) { + arr = angular.isArray(arr) ? arr : []; + if(!contains(arr, item, comparator)) { + arr.push(item); + } + return arr; + } + + // remove + function remove(arr, item, comparator) { + if (angular.isArray(arr)) { + for (var i = arr.length; i--;) { + if (comparator(arr[i], item)) { + arr.splice(i, 1); + break; + } + } + } + return arr; + } + + // http://stackoverflow.com/a/19228302/1458162 + function postLinkFn(scope, elem, attrs) { + // exclude recursion, but still keep the model + var checklistModel = attrs.checklistModel; + attrs.$set("checklistModel", null); + // compile with `ng-model` pointing to `checked` + $compile(elem)(scope); + attrs.$set("checklistModel", checklistModel); + + // getter / setter for original model + var getter = $parse(checklistModel); + var setter = getter.assign; + var checklistChange = $parse(attrs.checklistChange); + var checklistBeforeChange = $parse(attrs.checklistBeforeChange); + + // value added to list + var value = attrs.checklistValue ? $parse(attrs.checklistValue)(scope.$parent) : attrs.value; + + + var comparator = angular.equals; + + if (attrs.hasOwnProperty('checklistComparator')){ + if (attrs.checklistComparator[0] == '.') { + var comparatorExpression = attrs.checklistComparator.substring(1); + comparator = function (a, b) { + return a[comparatorExpression] === b[comparatorExpression]; + }; + + } else { + comparator = $parse(attrs.checklistComparator)(scope.$parent); + } + } + + // watch UI checked change + scope.$watch(attrs.ngModel, function(newValue, oldValue) { + if (newValue === oldValue) { + return; + } + + if (checklistBeforeChange && (checklistBeforeChange(scope) === false)) { + scope[attrs.ngModel] = contains(getter(scope.$parent), value, comparator); + return; + } + + setValueInChecklistModel(value, newValue); + + if (checklistChange) { + checklistChange(scope); + } + }); + + function setValueInChecklistModel(value, checked) { + var current = getter(scope.$parent); + if (angular.isFunction(setter)) { + if (checked === true) { + setter(scope.$parent, add(current, value, comparator)); + } else { + setter(scope.$parent, remove(current, value, comparator)); + } + } + + } + + // declare one function to be used for both $watch functions + function setChecked(newArr, oldArr) { + if (checklistBeforeChange && (checklistBeforeChange(scope) === false)) { + setValueInChecklistModel(value, scope[attrs.ngModel]); + return; + } + scope[attrs.ngModel] = contains(newArr, value, comparator); + } + + // watch original model change + // use the faster $watchCollection method if it's available + if (angular.isFunction(scope.$parent.$watchCollection)) { + scope.$parent.$watchCollection(checklistModel, setChecked); + } else { + scope.$parent.$watch(checklistModel, setChecked, true); + } + } + + return { + restrict: 'A', + priority: 1000, + terminal: true, + scope: true, + compile: function(tElement, tAttrs) { + if ((tElement[0].tagName !== 'INPUT' || tAttrs.type !== 'checkbox') && (tElement[0].tagName !== 'MD-CHECKBOX') && (!tAttrs.btnCheckbox)) { + throw 'checklist-model should be applied to `input[type="checkbox"]` or `md-checkbox`.'; + } + + if (!tAttrs.checklistValue && !tAttrs.value) { + throw 'You should provide `value` or `checklist-value`.'; + } + + // by default ngModel is 'checked', so we set it if not specified + if (!tAttrs.ngModel) { + // local scope var storing individual checkbox model + tAttrs.$set("ngModel", "checked"); + } + + return postLinkFn; + } + }; +}]); diff --git a/ntt_tool/static/js/libs/angular/ui-bootstrap-tpls-1.2.4.min.js b/ntt_tool/static/js/libs/angular/ui-bootstrap-tpls-1.2.4.min.js new file mode 100644 index 0000000..0eab296 --- /dev/null +++ b/ntt_tool/static/js/libs/angular/ui-bootstrap-tpls-1.2.4.min.js @@ -0,0 +1,10 @@ +/* + * angular-ui-bootstrap + * http://angular-ui.github.io/bootstrap/ + + * Version: 1.2.4 - 2016-03-06 + * License: MIT + */angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.debounce","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/popup.html","uib/template/datepicker/year.html","uib/template/modal/backdrop.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.collapse",[]).directive("uibCollapse",["$animate","$q","$parse","$injector",function(a,b,c,d){var e=d.has("$animateCss")?d.get("$animateCss"):null;return{link:function(d,f,g){function h(){f.hasClass("collapse")&&f.hasClass("in")||b.resolve(l(d)).then(function(){f.removeClass("collapse").addClass("collapsing").attr("aria-expanded",!0).attr("aria-hidden",!1),e?e(f,{addClass:"in",easing:"ease",to:{height:f[0].scrollHeight+"px"}}).start()["finally"](i):a.addClass(f,"in",{to:{height:f[0].scrollHeight+"px"}}).then(i)})}function i(){f.removeClass("collapsing").addClass("collapse").css({height:"auto"}),m(d)}function j(){return f.hasClass("collapse")||f.hasClass("in")?void b.resolve(n(d)).then(function(){f.css({height:f[0].scrollHeight+"px"}).removeClass("collapse").addClass("collapsing").attr("aria-expanded",!1).attr("aria-hidden",!0),e?e(f,{removeClass:"in",to:{height:"0"}}).start()["finally"](k):a.removeClass(f,"in",{to:{height:"0"}}).then(k)}):k()}function k(){f.css({height:"0"}),f.removeClass("collapsing").addClass("collapse"),o(d)}var l=c(g.expanding),m=c(g.expanded),n=c(g.collapsing),o=c(g.collapsed);d.$eval(g.uibCollapse)||f.addClass("in").addClass("collapse").attr("aria-expanded",!0).attr("aria-hidden",!1).css({height:"auto"}),d.$watch(g.uibCollapse,function(a){a?j():h()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("uibAccordionConfig",{closeOthers:!0}).controller("UibAccordionController",["$scope","$attrs","uibAccordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(c){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("uibAccordion",function(){return{controller:"UibAccordionController",controllerAs:"accordion",transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/accordion/accordion.html"}}}).directive("uibAccordionGroup",function(){return{require:"^uibAccordion",transclude:!0,replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/accordion/accordion-group.html"},scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.openClass=c.openClass||"panel-open",a.panelClass=c.panelClass||"panel-default",a.$watch("isOpen",function(c){b.toggleClass(a.openClass,!!c),c&&d.closeOthers(a)}),a.toggleOpen=function(b){a.isDisabled||b&&32!==b.which||(a.isOpen=!a.isOpen)};var e="accordiongroup-"+a.$id+"-"+Math.floor(1e4*Math.random());a.headingId=e+"-tab",a.panelId=e+"-panel"}}}).directive("uibAccordionHeading",function(){return{transclude:!0,template:"",replace:!0,require:"^uibAccordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,angular.noop))}}}).directive("uibAccordionTransclude",function(){return{require:"^uibAccordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.uibAccordionTransclude]},function(a){if(a){var c=angular.element(b[0].querySelector("[uib-accordion-header]"));c.html(""),c.append(a)}})}}}),angular.module("ui.bootstrap.alert",[]).controller("UibAlertController",["$scope","$attrs","$interpolate","$timeout",function(a,b,c,d){a.closeable=!!b.close;var e=angular.isDefined(b.dismissOnTimeout)?c(b.dismissOnTimeout)(a.$parent):null;e&&d(function(){a.close()},parseInt(e,10))}]).directive("uibAlert",function(){return{controller:"UibAlertController",controllerAs:"alert",templateUrl:function(a,b){return b.templateUrl||"uib/template/alert/alert.html"},transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}),angular.module("ui.bootstrap.buttons",[]).constant("uibButtonConfig",{activeClass:"active",toggleEvent:"click"}).controller("UibButtonsController",["uibButtonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("uibBtnRadio",["$parse",function(a){return{require:["uibBtnRadio","ngModel"],controller:"UibButtonsController",controllerAs:"buttons",link:function(b,c,d,e){var f=e[0],g=e[1],h=a(d.uibUncheckable);c.find("input").css({display:"none"}),g.$render=function(){c.toggleClass(f.activeClass,angular.equals(g.$modelValue,b.$eval(d.uibBtnRadio)))},c.on(f.toggleEvent,function(){if(!d.disabled){var a=c.hasClass(f.activeClass);(!a||angular.isDefined(d.uncheckable))&&b.$apply(function(){g.$setViewValue(a?null:b.$eval(d.uibBtnRadio)),g.$render()})}}),d.uibUncheckable&&b.$watch(h,function(a){d.$set("uncheckable",a?"":void 0)})}}}]).directive("uibBtnCheckbox",function(){return{require:["uibBtnCheckbox","ngModel"],controller:"UibButtonsController",controllerAs:"button",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){return angular.isDefined(b)?a.$eval(b):c}var h=d[0],i=d[1];b.find("input").css({display:"none"}),i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.on(h.toggleEvent,function(){c.disabled||a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",[]).controller("UibCarouselController",["$scope","$element","$interval","$timeout","$animate",function(a,b,c,d,e){function f(){for(;t.length;)t.shift()}function g(a){for(var b=0;b1){q[d].element.data(r,c.direction);var j=p.getCurrentIndex();angular.isNumber(j)&&q[j].element&&q[j].element.data(r,c.direction),a.$currentTransition=!0,e.on("addClass",q[d].element,function(b,c){if("close"===c&&(a.$currentTransition=null,e.off("addClass",b),t.length)){var d=t.pop().slide,g=d.index,i=g>p.getCurrentIndex()?"next":"prev";f(),h(d,g,i)}})}a.active=c.index,s=c.index,g(d),l()}}function i(a){for(var b=0;b0&&(n=c(m,b))}function m(){var b=+a.interval;o&&!isNaN(b)&&b>0&&q.length?a.next():a.pause()}var n,o,p=this,q=p.slides=a.slides=[],r="uib-slideDirection",s=a.active,t=[],u=!1;p.addSlide=function(b,c){q.push({slide:b,element:c}),q.sort(function(a,b){return+a.slide.index>+b.slide.index}),(b.index===a.active||1===q.length&&!angular.isNumber(a.active))&&(a.$currentTransition&&(a.$currentTransition=null),s=b.index,a.active=b.index,g(s),p.select(q[i(b)]),1===q.length&&a.play())},p.getCurrentIndex=function(){for(var a=0;a0&&s===c?c>=q.length?(s=q.length-1,a.active=s,g(s),p.select(q[q.length-1])):(s=c,a.active=s,g(s),p.select(q[c])):s>c&&(s--,a.active=s),0===q.length&&(s=null,a.active=null,f())},p.select=a.select=function(b,c){var d=i(b.slide);void 0===c&&(c=d>p.getCurrentIndex()?"next":"prev"),b.slide.index===s||a.$currentTransition?b&&b.slide.index!==s&&a.$currentTransition&&t.push(q[d]):h(b.slide,d,c)},a.indexOfSlide=function(a){return+a.slide.index},a.isActive=function(b){return a.active===b.slide.index},a.pause=function(){a.noPause||(o=!1,j())},a.play=function(){o||(o=!0,l())},a.$on("$destroy",function(){u=!0,j()}),a.$watch("noTransition",function(a){e.enabled(b,!a)}),a.$watch("interval",l),a.$watchCollection("slides",k),a.$watch("active",function(a){if(angular.isNumber(a)&&s!==a){for(var b=0;b-1){var g=!1;a=a.split("");for(var h=f;h-1){a=a.split(""),e[f]="("+d.regex+")",a[f]="$";for(var g=f+1,h=f+d.key.length;h>g;g++)e[g]="",a[g]="$";a=a.join(""),c.push({index:f,key:d.key,apply:d[b],matcher:d.regex})}}),{regex:new RegExp("^"+e.join("")+"$"),map:d(c,"index")}}function f(a,b,c){return 1>c?!1:1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}function g(a){return parseInt(a,10)}function h(a,b){return a&&b?l(a,b):a}function i(a,b){return a&&b?l(a,b,!0):a}function j(a,b){var c=Date.parse("Jan 01, 1970 00:00:00 "+a)/6e4;return isNaN(c)?b:c}function k(a,b){return a=new Date(a.getTime()),a.setMinutes(a.getMinutes()+b),a}function l(a,b,c){c=c?-1:1;var d=j(b,a.getTimezoneOffset());return k(a,c*(d-a.getTimezoneOffset()))}var m,n,o=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;this.init=function(){m=b.id,this.parsers={},this.formatters={},n=[{key:"yyyy",regex:"\\d{4}",apply:function(a){this.year=+a},formatter:function(a){var b=new Date;return b.setFullYear(Math.abs(a.getFullYear())),c(b,"yyyy")}},{key:"yy",regex:"\\d{2}",apply:function(a){this.year=+a+2e3},formatter:function(a){var b=new Date;return b.setFullYear(Math.abs(a.getFullYear())),c(b,"yy")}},{key:"y",regex:"\\d{1,4}",apply:function(a){this.year=+a},formatter:function(a){var b=new Date;return b.setFullYear(Math.abs(a.getFullYear())),c(b,"y")}},{key:"M!",regex:"0?[1-9]|1[0-2]",apply:function(a){this.month=a-1},formatter:function(a){var b=a.getMonth();return/^[0-9]$/.test(b)?c(a,"MM"):c(a,"M")}},{key:"MMMM",regex:b.DATETIME_FORMATS.MONTH.join("|"),apply:function(a){this.month=b.DATETIME_FORMATS.MONTH.indexOf(a)},formatter:function(a){return c(a,"MMMM")}},{key:"MMM",regex:b.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(a){this.month=b.DATETIME_FORMATS.SHORTMONTH.indexOf(a)},formatter:function(a){return c(a,"MMM")}},{key:"MM",regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1},formatter:function(a){return c(a,"MM")}},{key:"M",regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1},formatter:function(a){return c(a,"M")}},{key:"d!",regex:"[0-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a},formatter:function(a){var b=a.getDate();return/^[1-9]$/.test(b)?c(a,"dd"):c(a,"d")}},{key:"dd",regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a},formatter:function(a){return c(a,"dd")}},{key:"d",regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a},formatter:function(a){return c(a,"d")}},{key:"EEEE",regex:b.DATETIME_FORMATS.DAY.join("|"),formatter:function(a){return c(a,"EEEE")}},{key:"EEE",regex:b.DATETIME_FORMATS.SHORTDAY.join("|"),formatter:function(a){return c(a,"EEE")}},{key:"HH",regex:"(?:0|1)[0-9]|2[0-3]",apply:function(a){this.hours=+a},formatter:function(a){return c(a,"HH")}},{key:"hh",regex:"0[0-9]|1[0-2]",apply:function(a){this.hours=+a},formatter:function(a){return c(a,"hh")}},{key:"H",regex:"1?[0-9]|2[0-3]",apply:function(a){this.hours=+a},formatter:function(a){return c(a,"H")}},{key:"h",regex:"[0-9]|1[0-2]",apply:function(a){this.hours=+a},formatter:function(a){return c(a,"h")}},{key:"mm",regex:"[0-5][0-9]",apply:function(a){this.minutes=+a},formatter:function(a){return c(a,"mm")}},{key:"m",regex:"[0-9]|[1-5][0-9]",apply:function(a){this.minutes=+a},formatter:function(a){return c(a,"m")}},{key:"sss",regex:"[0-9][0-9][0-9]",apply:function(a){this.milliseconds=+a},formatter:function(a){return c(a,"sss")}},{key:"ss",regex:"[0-5][0-9]",apply:function(a){this.seconds=+a},formatter:function(a){return c(a,"ss")}},{key:"s",regex:"[0-9]|[1-5][0-9]",apply:function(a){this.seconds=+a},formatter:function(a){return c(a,"s")}},{key:"a",regex:b.DATETIME_FORMATS.AMPMS.join("|"),apply:function(a){12===this.hours&&(this.hours=0),"PM"===a&&(this.hours+=12)},formatter:function(a){return c(a,"a")}},{key:"Z",regex:"[+-]\\d{4}",apply:function(a){var b=a.match(/([+-])(\d{2})(\d{2})/),c=b[1],d=b[2],e=b[3];this.hours+=g(c+d),this.minutes+=g(c+e)},formatter:function(a){return c(a,"Z")}},{key:"ww",regex:"[0-4][0-9]|5[0-3]",formatter:function(a){return c(a,"ww")}},{key:"w",regex:"[0-9]|[1-4][0-9]|5[0-3]",formatter:function(a){return c(a,"w")}},{key:"GGGG",regex:b.DATETIME_FORMATS.ERANAMES.join("|").replace(/\s/g,"\\s"),formatter:function(a){return c(a,"GGGG")}},{key:"GGG",regex:b.DATETIME_FORMATS.ERAS.join("|"),formatter:function(a){return c(a,"GGG")}},{key:"GG",regex:b.DATETIME_FORMATS.ERAS.join("|"),formatter:function(a){return c(a,"GG")}},{key:"G",regex:b.DATETIME_FORMATS.ERAS.join("|"),formatter:function(a){return c(a,"G")}}]},this.init(),this.filter=function(a,c){if(!angular.isDate(a)||isNaN(a)||!c)return"";c=b.DATETIME_FORMATS[c]||c,b.id!==m&&this.init(),this.formatters[c]||(this.formatters[c]=e(c,"formatter"));var d=this.formatters[c],f=d.map,g=c;return f.reduce(function(b,c,d){var e=g.match(new RegExp("(.*)"+c.key));e&&angular.isString(e[1])&&(b+=e[1],g=g.replace(e[1]+c.key,""));var h=d===f.length-1?g:"";return c.apply?b+c.apply.call(null,a)+h:b+h},"")},this.parse=function(c,d,g){if(!angular.isString(c)||!d)return c;d=b.DATETIME_FORMATS[d]||d,d=d.replace(o,"\\$&"),b.id!==m&&this.init(),this.parsers[d]||(this.parsers[d]=e(d,"apply"));var h=this.parsers[d],i=h.regex,j=h.map,k=c.match(i),l=!1;if(k&&k.length){var n,p;angular.isDate(g)&&!isNaN(g.getTime())?n={year:g.getFullYear(),month:g.getMonth(),date:g.getDate(),hours:g.getHours(),minutes:g.getMinutes(),seconds:g.getSeconds(),milliseconds:g.getMilliseconds()}:(g&&a.warn("dateparser:","baseDate is not a valid date"),n={year:1900,month:0,date:1,hours:0,minutes:0,seconds:0,milliseconds:0});for(var q=1,r=k.length;r>q;q++){var s=j[q-1];"Z"===s.matcher&&(l=!0),s.apply&&s.apply.call(n,k[q])}var t=l?Date.prototype.setUTCFullYear:Date.prototype.setFullYear,u=l?Date.prototype.setUTCHours:Date.prototype.setHours;return f(n.year,n.month,n.date)&&(!angular.isDate(g)||isNaN(g.getTime())||l?(p=new Date(0),t.call(p,n.year,n.month,n.date),u.call(p,n.hours||0,n.minutes||0,n.seconds||0,n.milliseconds||0)):(p=new Date(g),t.call(p,n.year,n.month,n.date),u.call(p,n.hours,n.minutes,n.seconds,n.milliseconds))),p}},this.toTimezone=h,this.fromTimezone=i,this.timezoneToOffset=j,this.addDateMinutes=k,this.convertTimezoneToLocal=l}]),angular.module("ui.bootstrap.isClass",[]).directive("uibIsClass",["$animate",function(a){var b=/^\s*([\s\S]+?)\s+on\s+([\s\S]+?)\s*$/,c=/^\s*([\s\S]+?)\s+for\s+([\s\S]+?)\s*$/;return{restrict:"A",compile:function(d,e){function f(a,b,c){i.push(a),j.push({scope:a,element:b}),o.forEach(function(b,c){g(b,a)}),a.$on("$destroy",h)}function g(b,d){var e=b.match(c),f=d.$eval(e[1]),g=e[2],h=k[b];if(!h){var i=function(b){var c=null;j.some(function(a){var d=a.scope.$eval(m);return d===b?(c=a,!0):void 0}),h.lastActivated!==c&&(h.lastActivated&&a.removeClass(h.lastActivated.element,f),c&&a.addClass(c.element,f),h.lastActivated=c)};k[b]=h={lastActivated:null,scope:d,watchFn:i,compareWithExp:g,watcher:d.$watch(g,i)}}h.watchFn(d.$eval(g))}function h(a){var b=a.targetScope,c=i.indexOf(b);if(i.splice(c,1),j.splice(c,1),i.length){var d=i[0];angular.forEach(k,function(a){a.scope===b&&(a.watcher=d.$watch(a.compareWithExp,a.watchFn),a.scope=d)})}else k={}}var i=[],j=[],k={},l=e.uibIsClass.match(b),m=l[2],n=l[1],o=n.split(",");return f}}}]),angular.module("ui.bootstrap.position",[]).factory("$uibPosition",["$document","$window",function(a,b){var c,d={normal:/(auto|scroll)/,hidden:/(auto|scroll|hidden)/},e={auto:/\s?auto?\s?/i,primary:/^(top|bottom|left|right)$/,secondary:/^(top|bottom|left|right|center)$/,vertical:/^(top|bottom)$/};return{getRawNode:function(a){return a.nodeName?a:a[0]||a},parseStyle:function(a){return a=parseFloat(a),isFinite(a)?a:0},offsetParent:function(c){function d(a){return"static"===(b.getComputedStyle(a).position||"static")}c=this.getRawNode(c);for(var e=c.offsetParent||a[0].documentElement;e&&e!==a[0].documentElement&&d(e);)e=e.offsetParent;return e||a[0].documentElement},scrollbarWidth:function(){if(angular.isUndefined(c)){var b=angular.element('
');a.find("body").append(b),c=b[0].offsetWidth-b[0].clientWidth,c=isFinite(c)?c:0,b.remove()}return c},isScrollable:function(a,c){a=this.getRawNode(a);var e=c?d.hidden:d.normal,f=b.getComputedStyle(a);return e.test(f.overflow+f.overflowY+f.overflowX)},scrollParent:function(c,e){c=this.getRawNode(c);var f=e?d.hidden:d.normal,g=a[0].documentElement,h=b.getComputedStyle(c),i="absolute"===h.position,j=c.parentElement||g;if(j===g||"fixed"===h.position)return g;for(;j.parentElement&&j!==g;){var k=b.getComputedStyle(j);if(i&&"static"!==k.position&&(i=!1),!i&&f.test(k.overflow+k.overflowY+k.overflowX))break;j=j.parentElement}return j},position:function(c,d){c=this.getRawNode(c);var e=this.offset(c);if(d){var f=b.getComputedStyle(c);e.top-=this.parseStyle(f.marginTop),e.left-=this.parseStyle(f.marginLeft)}var g=this.offsetParent(c),h={top:0,left:0};return g!==a[0].documentElement&&(h=this.offset(g),h.top+=g.clientTop-g.scrollTop,h.left+=g.clientLeft-g.scrollLeft),{width:Math.round(angular.isNumber(e.width)?e.width:c.offsetWidth),height:Math.round(angular.isNumber(e.height)?e.height:c.offsetHeight),top:Math.round(e.top-h.top),left:Math.round(e.left-h.left)}},offset:function(c){c=this.getRawNode(c);var d=c.getBoundingClientRect();return{width:Math.round(angular.isNumber(d.width)?d.width:c.offsetWidth),height:Math.round(angular.isNumber(d.height)?d.height:c.offsetHeight),top:Math.round(d.top+(b.pageYOffset||a[0].documentElement.scrollTop)),left:Math.round(d.left+(b.pageXOffset||a[0].documentElement.scrollLeft))}},viewportOffset:function(c,d,e){c=this.getRawNode(c),e=e!==!1?!0:!1;var f=c.getBoundingClientRect(),g={top:0,left:0,bottom:0,right:0},h=d?a[0].documentElement:this.scrollParent(c),i=h.getBoundingClientRect();if(g.top=i.top+h.clientTop,g.left=i.left+h.clientLeft,h===a[0].documentElement&&(g.top+=b.pageYOffset,g.left+=b.pageXOffset),g.bottom=g.top+h.clientHeight,g.right=g.left+h.clientWidth,e){var j=b.getComputedStyle(h);g.top+=this.parseStyle(j.paddingTop),g.bottom-=this.parseStyle(j.paddingBottom),g.left+=this.parseStyle(j.paddingLeft),g.right-=this.parseStyle(j.paddingRight)}return{top:Math.round(f.top-g.top),bottom:Math.round(g.bottom-f.bottom),left:Math.round(f.left-g.left),right:Math.round(g.right-f.right)}},parsePlacement:function(a){var b=e.auto.test(a);return b&&(a=a.replace(e.auto,"")),a=a.split("-"),a[0]=a[0]||"top",e.primary.test(a[0])||(a[0]="top"),a[1]=a[1]||"center",e.secondary.test(a[1])||(a[1]="center"),b?a[2]=!0:a[2]=!1,a},positionElements:function(a,c,d,f){a=this.getRawNode(a),c=this.getRawNode(c);var g=angular.isDefined(c.offsetWidth)?c.offsetWidth:c.prop("offsetWidth"),h=angular.isDefined(c.offsetHeight)?c.offsetHeight:c.prop("offsetHeight");d=this.parsePlacement(d);var i=f?this.offset(a):this.position(a),j={top:0,left:0,placement:""};if(d[2]){var k=this.viewportOffset(a,f),l=b.getComputedStyle(c),m={width:g+Math.round(Math.abs(this.parseStyle(l.marginLeft)+this.parseStyle(l.marginRight))),height:h+Math.round(Math.abs(this.parseStyle(l.marginTop)+this.parseStyle(l.marginBottom)))};if(d[0]="top"===d[0]&&m.height>k.top&&m.height<=k.bottom?"bottom":"bottom"===d[0]&&m.height>k.bottom&&m.height<=k.top?"top":"left"===d[0]&&m.width>k.left&&m.width<=k.right?"right":"right"===d[0]&&m.width>k.right&&m.width<=k.left?"left":d[0],d[1]="top"===d[1]&&m.height-i.height>k.bottom&&m.height-i.height<=k.top?"bottom":"bottom"===d[1]&&m.height-i.height>k.top&&m.height-i.height<=k.bottom?"top":"left"===d[1]&&m.width-i.width>k.right&&m.width-i.width<=k.left?"right":"right"===d[1]&&m.width-i.width>k.left&&m.width-i.width<=k.right?"left":d[1],"center"===d[1])if(e.vertical.test(d[0])){var n=i.width/2-g/2;k.left+n<0&&m.width-i.width<=k.right?d[1]="left":k.right+n<0&&m.width-i.width<=k.left&&(d[1]="right")}else{var o=i.height/2-m.height/2;k.top+o<0&&m.height-i.height<=k.bottom?d[1]="top":k.bottom+o<0&&m.height-i.height<=k.top&&(d[1]="bottom")}}switch(d[0]){case"top":j.top=i.top-h;break;case"bottom":j.top=i.top+i.height;break;case"left":j.left=i.left-g;break;case"right":j.left=i.left+i.width}switch(d[1]){case"top":j.top=i.top;break;case"bottom":j.top=i.top+i.height-h;break;case"left":j.left=i.left;break;case"right":j.left=i.left+i.width-g;break;case"center":e.vertical.test(d[0])?j.left=i.left+i.width/2-g/2:j.top=i.top+i.height/2-h/2}return j.top=Math.round(j.top),j.left=Math.round(j.left),j.placement="center"===d[1]?d[0]:d[0]+"-"+d[1],j},positionArrow:function(a,c){a=this.getRawNode(a);var d=a.querySelector(".tooltip-inner, .popover-inner");if(d){var f=angular.element(d).hasClass("tooltip-inner"),g=f?a.querySelector(".tooltip-arrow"):a.querySelector(".arrow");if(g){var h={top:"",bottom:"",left:"",right:""};if(c=this.parsePlacement(c),"center"===c[1])return void angular.element(g).css(h);var i="border-"+c[0]+"-width",j=b.getComputedStyle(g)[i],k="border-";k+=e.vertical.test(c[0])?c[0]+"-"+c[1]:c[1]+"-"+c[0],k+="-radius";var l=b.getComputedStyle(f?d:a)[k];switch(c[0]){case"top":h.bottom=f?"0":"-"+j;break;case"bottom":h.top=f?"0":"-"+j;break;case"left":h.right=f?"0":"-"+j;break;case"right":h.left=f?"0":"-"+j}h[c[1]]=l,angular.element(g).css(h)}}}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position"]).value("$datepickerSuppressError",!1).value("uibDatepickerAttributeWarning",!0).constant("uibDatepickerConfig",{datepickerMode:"day",formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",maxDate:null,maxMode:"year",minDate:null,minMode:"day",ngModelOptions:{},shortcutPropagation:!1,showWeeks:!0,yearColumns:5,yearRows:4}).controller("UibDatepickerController",["$scope","$attrs","$parse","$interpolate","$locale","$log","dateFilter","uibDatepickerConfig","$datepickerSuppressError","uibDatepickerAttributeWarning","uibDateParser",function(a,b,c,d,e,f,g,h,i,j,k){function l(b){a.datepickerMode=b,q&&(a.datepickerOptions.datepickerMode=b)}var m=this,n={$setViewValue:angular.noop},o={},p=[],q=!!b.datepickerOptions;if(this.modes=["day","month","year"],q)["customClass","dateDisabled","datepickerMode","formatDay","formatDayHeader","formatDayTitle","formatMonth","formatMonthTitle","formatYear","initDate","maxDate","maxMode","minDate","minMode","showWeeks","shortcutPropagation","startingDay","yearColumns","yearRows"].forEach(function(b){switch(b){case"customClass":case"dateDisabled":a[b]=a.datepickerOptions[b]||angular.noop;break;case"datepickerMode":a.datepickerMode=angular.isDefined(a.datepickerOptions.datepickerMode)?a.datepickerOptions.datepickerMode:h.datepickerMode;break;case"formatDay":case"formatDayHeader":case"formatDayTitle":case"formatMonth":case"formatMonthTitle":case"formatYear":m[b]=angular.isDefined(a.datepickerOptions[b])?d(a.datepickerOptions[b])(a.$parent):h[b];break;case"showWeeks":case"shortcutPropagation":case"yearColumns":case"yearRows":m[b]=angular.isDefined(a.datepickerOptions[b])?a.datepickerOptions[b]:h[b];break;case"startingDay":angular.isDefined(a.datepickerOptions.startingDay)?m.startingDay=a.datepickerOptions.startingDay:angular.isNumber(h.startingDay)?m.startingDay=h.startingDay:m.startingDay=(e.DATETIME_FORMATS.FIRSTDAYOFWEEK+8)%7;break;case"maxDate":case"minDate":a.datepickerOptions[b]?a.$watch(function(){return a.datepickerOptions[b]},function(a){a?angular.isDate(a)?m[b]=k.fromTimezone(new Date(a),o.timezone):m[b]=new Date(g(a,"medium")):m[b]=null,m.refreshView()}):m[b]=h[b]?k.fromTimezone(new Date(h[b]),o.timezone):null;break;case"maxMode":case"minMode":a.datepickerOptions[b]?a.$watch(function(){return a.datepickerOptions[b]},function(c){m[b]=a[b]=angular.isDefined(c)?c:datepickerOptions[b],("minMode"===b&&m.modes.indexOf(a.datepickerOptions.datepickerMode)m.modes.indexOf(m[b]))&&(a.datepickerMode=m[b],a.datepickerOptions.datepickerMode=m[b])}):m[b]=a[b]=h[b]||null;break;case"initDate":a.datepickerOptions.initDate?(m.activeDate=k.fromTimezone(a.datepickerOptions.initDate,o.timezone)||new Date,a.$watch(function(){return a.datepickerOptions.initDate},function(a){a&&(n.$isEmpty(n.$modelValue)||n.$invalid)&&(m.activeDate=k.fromTimezone(a,o.timezone),m.refreshView())})):m.activeDate=new Date}});else{if(angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle"],function(c){m[c]=angular.isDefined(b[c])?d(b[c])(a.$parent):h[c],angular.isDefined(b[c])&&j&&f.warn("uib-datepicker "+c+" attribute usage is deprecated, use datepicker-options attribute instead")}),angular.forEach(["showWeeks","yearRows","yearColumns","shortcutPropagation"],function(c){m[c]=angular.isDefined(b[c])?a.$parent.$eval(b[c]):h[c],angular.isDefined(b[c])&&j&&f.warn("uib-datepicker "+c+" attribute usage is deprecated, use datepicker-options attribute instead")}),angular.forEach(["dateDisabled","customClass"],function(a){angular.isDefined(b[a])&&j&&f.warn("uib-datepicker "+a+" attribute usage is deprecated, use datepicker-options attribute instead")}),angular.isDefined(b.startingDay)?(j&&f.warn("uib-datepicker startingDay attribute usage is deprecated, use datepicker-options attribute instead"),m.startingDay=a.$parent.$eval(b.startingDay)):angular.isNumber(h.startingDay)?m.startingDay=h.startingDay:m.startingDay=(e.DATETIME_FORMATS.FIRSTDAYOFWEEK+8)%7,angular.forEach(["minDate","maxDate"],function(c){b[c]?(j&&f.warn("uib-datepicker "+c+" attribute usage is deprecated, use datepicker-options attribute instead"),p.push(a.$parent.$watch(b[c],function(a){a?angular.isDate(a)?m[c]=k.fromTimezone(new Date(a),o.timezone):m[c]=new Date(g(a,"medium")):m[c]=null,m.refreshView()}))):m[c]=h[c]?k.fromTimezone(new Date(h[c]),o.timezone):null}),angular.forEach(["minMode","maxMode"],function(c){b[c]?(j&&f.warn("uib-datepicker "+c+" attribute usage is deprecated, use datepicker-options attribute instead"),p.push(a.$parent.$watch(b[c],function(d){m[c]=a[c]=angular.isDefined(d)?d:b[c],("minMode"===c&&m.modes.indexOf(a.datepickerMode)m.modes.indexOf(m[c]))&&(a.datepickerMode=m[c])}))):m[c]=a[c]=h[c]||null}),angular.isDefined(b.initDate)){j&&f.warn("uib-datepicker initDate attribute usage is deprecated, use datepicker-options attribute instead");var r=k.fromTimezone(a.$parent.$eval(b.initDate),o.timezone);this.activeDate=isNaN(r)?new Date:r,p.push(a.$parent.$watch(b.initDate,function(a){a&&(n.$isEmpty(n.$modelValue)||n.$invalid)&&(a=k.fromTimezone(a,o.timezone),m.activeDate=isNaN(a)?new Date:a,m.refreshView())}))}else this.activeDate=new Date;b.datepickerMode&&j&&f.warn("uib-datepicker datepickerMode attribute usage is deprecated, use datepicker-options attribute instead"),a.datepickerMode=a.datepickerMode||h.datepickerMode}a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),a.disabled=angular.isDefined(b.disabled)||!1,angular.isDefined(b.ngDisabled)&&p.push(a.$parent.$watch(b.ngDisabled,function(b){a.disabled=b,m.refreshView()})),a.isActive=function(b){return 0===m.compare(b.date,m.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){n=a,o=a.$options||h.ngModelOptions,this.activeDate=n.$modelValue||new Date,n.$render=function(){m.render()}},this.render=function(){if(n.$viewValue){var a=new Date(n.$viewValue),b=!isNaN(a);b?this.activeDate=k.fromTimezone(a,o.timezone):i||f.error('Datepicker directive: "ng-model" value must be a Date object')}this.refreshView()},this.refreshView=function(){if(this.element){a.selectedDt=null,this._refreshView(),a.activeDt&&(a.activeDateId=a.activeDt.uid);var b=n.$viewValue?new Date(n.$viewValue):null;b=k.fromTimezone(b,o.timezone),n.$setValidity("dateDisabled",!b||this.element&&!this.isDisabled(b))}},this.createDateObject=function(b,c){var d=n.$viewValue?new Date(n.$viewValue):null;d=k.fromTimezone(d,o.timezone);var e=new Date;e=k.fromTimezone(e,o.timezone);var f=this.compare(b,e),g={date:b,label:k.filter(b,c),selected:d&&0===this.compare(b,d),disabled:this.isDisabled(b),past:0>f,current:0===f,future:f>0,customClass:this.customClass(b)||null};return d&&0===this.compare(b,d)&&(a.selectedDt=g),m.activeDate&&0===this.compare(g.date,m.activeDate)&&(a.activeDt=g),g},this.isDisabled=function(b){return a.disabled||this.minDate&&this.compare(b,this.minDate)<0||this.maxDate&&this.compare(b,this.maxDate)>0||a.dateDisabled&&a.dateDisabled({date:b,mode:a.datepickerMode})},this.customClass=function(b){return a.customClass({date:b,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c; +},a.select=function(b){if(a.datepickerMode===m.minMode){var c=n.$viewValue?k.fromTimezone(new Date(n.$viewValue),o.timezone):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),c=k.toTimezone(c,o.timezone),n.$setViewValue(c),n.$render()}else m.activeDate=b,l(m.modes[m.modes.indexOf(a.datepickerMode)-1]),a.$emit("uib:datepicker.mode")},a.move=function(a){var b=m.activeDate.getFullYear()+a*(m.step.years||0),c=m.activeDate.getMonth()+a*(m.step.months||0);m.activeDate.setFullYear(b,c,1),m.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===m.maxMode&&1===b||a.datepickerMode===m.minMode&&-1===b||(l(m.modes[m.modes.indexOf(a.datepickerMode)+b]),a.$emit("uib:datepicker.mode"))},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var s=function(){m.element[0].focus()};a.$on("uib:datepicker.focus",s),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey&&!a.disabled)if(b.preventDefault(),m.shortcutPropagation||b.stopPropagation(),"enter"===c||"space"===c){if(m.isDisabled(m.activeDate))return;a.select(m.activeDate)}else!b.ctrlKey||"up"!==c&&"down"!==c?(m.handleKeyDown(c,b),m.refreshView()):a.toggleMode("up"===c?1:-1)},a.$on("$destroy",function(){for(;p.length;)p.shift()()})}]).controller("UibDaypickerController",["$scope","$element","dateFilter",function(a,b,c){function d(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?f[b]:29}function e(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}var f=[31,28,31,30,31,30,31,31,30,31,30,31];this.step={months:1},this.element=b,this.init=function(b){angular.extend(b,this),a.showWeeks=b.showWeeks,b.refreshView()},this.getDates=function(a,b){for(var c,d=new Array(b),e=new Date(a),f=0;b>f;)c=new Date(e),d[f++]=c,e.setDate(e.getDate()+1);return d},this._refreshView=function(){var b=this.activeDate.getFullYear(),d=this.activeDate.getMonth(),f=new Date(this.activeDate);f.setFullYear(b,d,1);var g=this.startingDay-f.getDay(),h=g>0?7-g:-g,i=new Date(f);h>0&&i.setDate(-h+1);for(var j=this.getDates(i,42),k=0;42>k;k++)j[k]=angular.extend(this.createDateObject(j[k],this.formatDay),{secondary:j[k].getMonth()!==d,uid:a.uniqueId+"-"+k});a.labels=new Array(7);for(var l=0;7>l;l++)a.labels[l]={abbr:c(j[l].date,this.formatDayHeader),full:c(j[l].date,"EEEE")};if(a.title=c(this.activeDate,this.formatDayTitle),a.rows=this.split(j,7),a.showWeeks){a.weekNumbers=[];for(var m=(11-this.startingDay)%7,n=a.rows.length,o=0;n>o;o++)a.weekNumbers.push(e(a.rows[o][m].date))}},this.compare=function(a,b){var c=new Date(a.getFullYear(),a.getMonth(),a.getDate()),d=new Date(b.getFullYear(),b.getMonth(),b.getDate());return c.setFullYear(a.getFullYear()),d.setFullYear(b.getFullYear()),c-d},this.handleKeyDown=function(a,b){var c=this.activeDate.getDate();if("left"===a)c-=1;else if("up"===a)c-=7;else if("right"===a)c+=1;else if("down"===a)c+=7;else if("pageup"===a||"pagedown"===a){var e=this.activeDate.getMonth()+("pageup"===a?-1:1);this.activeDate.setMonth(e,1),c=Math.min(d(this.activeDate.getFullYear(),this.activeDate.getMonth()),c)}else"home"===a?c=1:"end"===a&&(c=d(this.activeDate.getFullYear(),this.activeDate.getMonth()));this.activeDate.setDate(c)}}]).controller("UibMonthpickerController",["$scope","$element","dateFilter",function(a,b,c){this.step={years:1},this.element=b,this.init=function(a){angular.extend(a,this),a.refreshView()},this._refreshView=function(){for(var b,d=new Array(12),e=this.activeDate.getFullYear(),f=0;12>f;f++)b=new Date(this.activeDate),b.setFullYear(e,f,1),d[f]=angular.extend(this.createDateObject(b,this.formatMonth),{uid:a.uniqueId+"-"+f});a.title=c(this.activeDate,this.formatMonthTitle),a.rows=this.split(d,3)},this.compare=function(a,b){var c=new Date(a.getFullYear(),a.getMonth()),d=new Date(b.getFullYear(),b.getMonth());return c.setFullYear(a.getFullYear()),d.setFullYear(b.getFullYear()),c-d},this.handleKeyDown=function(a,b){var c=this.activeDate.getMonth();if("left"===a)c-=1;else if("up"===a)c-=3;else if("right"===a)c+=1;else if("down"===a)c+=3;else if("pageup"===a||"pagedown"===a){var d=this.activeDate.getFullYear()+("pageup"===a?-1:1);this.activeDate.setFullYear(d)}else"home"===a?c=0:"end"===a&&(c=11);this.activeDate.setMonth(c)}}]).controller("UibYearpickerController",["$scope","$element","dateFilter",function(a,b,c){function d(a){return parseInt((a-1)/f,10)*f+1}var e,f;this.element=b,this.yearpickerInit=function(){e=this.yearColumns,f=this.yearRows*e,this.step={years:f}},this._refreshView=function(){for(var b,c=new Array(f),g=0,h=d(this.activeDate.getFullYear());f>g;g++)b=new Date(this.activeDate),b.setFullYear(h+g,0,1),c[g]=angular.extend(this.createDateObject(b,this.formatYear),{uid:a.uniqueId+"-"+g});a.title=[c[0].label,c[f-1].label].join(" - "),a.rows=this.split(c,e),a.columns=e},this.compare=function(a,b){return a.getFullYear()-b.getFullYear()},this.handleKeyDown=function(a,b){var c=this.activeDate.getFullYear();"left"===a?c-=1:"up"===a?c-=e:"right"===a?c+=1:"down"===a?c+=e:"pageup"===a||"pagedown"===a?c+=("pageup"===a?-1:1)*f:"home"===a?c=d(this.activeDate.getFullYear()):"end"===a&&(c=d(this.activeDate.getFullYear())+f-1),this.activeDate.setFullYear(c)}}]).directive("uibDatepicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/datepicker.html"},scope:{datepickerMode:"=?",datepickerOptions:"=?",dateDisabled:"&",customClass:"&",shortcutPropagation:"&?"},require:["uibDatepicker","^ngModel"],controller:"UibDatepickerController",controllerAs:"datepicker",link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}).directive("uibDaypicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/day.html"},require:["^uibDatepicker","uibDaypicker"],controller:"UibDaypickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibMonthpicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/month.html"},require:["^uibDatepicker","uibMonthpicker"],controller:"UibMonthpickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibYearpicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/year.html"},require:["^uibDatepicker","uibYearpicker"],controller:"UibYearpickerController",link:function(a,b,c,d){var e=d[0];angular.extend(e,d[1]),e.yearpickerInit(),e.refreshView()}}}).value("uibDatepickerPopupAttributeWarning",!0).constant("uibDatepickerPopupConfig",{altInputFormats:[],appendToBody:!1,clearText:"Clear",closeOnDateSelection:!0,closeText:"Done",currentText:"Today",datepickerPopup:"yyyy-MM-dd",datepickerPopupTemplateUrl:"uib/template/datepicker/popup.html",datepickerTemplateUrl:"uib/template/datepicker/datepicker.html",html5Types:{date:"yyyy-MM-dd","datetime-local":"yyyy-MM-ddTHH:mm:ss.sss",month:"yyyy-MM"},onOpenFocus:!0,showButtonBar:!0,placement:"auto bottom-left"}).controller("UibDatepickerPopupController",["$scope","$element","$attrs","$compile","$log","$parse","$window","$document","$rootScope","$uibPosition","dateFilter","uibDateParser","uibDatepickerPopupConfig","$timeout","uibDatepickerConfig","uibDatepickerPopupAttributeWarning",function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p){function q(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function r(b){var c=l.parse(b,x,a.date);if(isNaN(c))for(var d=0;d
"),a.ngModelOptions=angular.copy(H),a.ngModelOptions.timezone=null,a.ngModelOptions.updateOnDefault===!0&&(a.ngModelOptions.updateOn=a.ngModelOptions.updateOn?a.ngModelOptions.updateOn+" default":"default"),D.attr({"ng-model":"date","ng-model-options":"ngModelOptions","ng-change":"dateSelection(date)","template-url":B}),E=angular.element(D.children()[0]),E.attr("template-url",C),L&&"month"===c.type&&(E.attr("datepicker-mode",'"month"'),E.attr("min-mode","month")),a.datepickerOptions&&E.attr("datepicker-options","datepickerOptions"),angular.forEach(["minMode","maxMode","datepickerMode","shortcutPropagation"],function(b){if(c[b]){p&&e.warn("uib-datepicker settings via uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead");var d=f(c[b]),g={get:function(){return d(a.$parent)}};if(E.attr(q(b),"watchData."+b),"datepickerMode"===b){var h=d.assign;g.set=function(b){h(a.$parent,b)}}Object.defineProperty(a.watchData,b,g)}}),angular.forEach(["minDate","maxDate","initDate"],function(b){if(c[b]){p&&e.warn("uib-datepicker settings via uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead");var d=f(c[b]);M.push(a.$parent.$watch(d,function(c){if("minDate"===b||"maxDate"===b)null===c?K[b]=null:angular.isDate(c)?K[b]=l.fromTimezone(new Date(c),H.timezone):K[b]=new Date(k(c,"medium")),a.watchData[b]=null===c?null:K[b];else{var d=c?new Date(c):new Date;a.watchData[b]=l.fromTimezone(d,H.timezone)}})),E.attr(q(b),"watchData."+b)}}),c.dateDisabled&&(p&&e.warn("uib-datepicker settings via uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead"),E.attr("date-disabled","dateDisabled({ date: date, mode: mode })")),angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","showWeeks","startingDay","yearRows","yearColumns"],function(a){angular.isDefined(c[a])&&(p&&e.warn("uib-datepicker settings via uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead"),E.attr(q(a),c[a]))}),c.customClass&&(p&&e.warn("uib-datepicker settings via uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead"),E.attr("custom-class","customClass({ date: date, mode: mode })")),L?G.$formatters.push(function(b){return a.date=l.fromTimezone(b,H.timezone),b}):(G.$$parserName="date",G.$validators.date=t,G.$parsers.unshift(s),G.$formatters.push(function(b){return G.$isEmpty(b)?(a.date=b,b):(a.date=l.fromTimezone(b,H.timezone),angular.isNumber(a.date)&&(a.date=new Date(a.date)),l.filter(a.date,x))})),G.$viewChangeListeners.push(function(){a.date=r(G.$viewValue)}),b.on("keydown",v),I=d(D)(a),D.remove(),z?h.find("body").append(I):b.after(I),a.$on("$destroy",function(){for(a.isOpen===!0&&(i.$$phase||a.$apply(function(){a.isOpen=!1})),I.remove(),b.off("keydown",v),h.off("click",u),F&&F.off("scroll",w),angular.element(g).off("resize",w);M.length;)M.shift()()})},a.getText=function(b){return a[b+"Text"]||m[b+"Text"]},a.isDisabled=function(b){return"today"===b&&(b=new Date),a.watchData.minDate&&a.compare(b,K.minDate)<0||a.watchData.maxDate&&a.compare(b,K.maxDate)>0},a.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},a.dateSelection=function(c){angular.isDefined(c)&&(a.date=c);var d=a.date?l.filter(a.date,x):null;b.val(d),G.$setViewValue(d),y&&(a.isOpen=!1,b[0].focus())},a.keydown=function(c){27===c.which&&(c.stopPropagation(),a.isOpen=!1,b[0].focus())},a.select=function(b,c){if(c.stopPropagation(),"today"===b){var d=new Date;angular.isDate(a.date)?(b=new Date(a.date),b.setFullYear(d.getFullYear(),d.getMonth(),d.getDate())):b=new Date(d.setHours(0,0,0,0))}a.dateSelection(b)},a.close=function(c){c.stopPropagation(),a.isOpen=!1,b[0].focus()},a.disabled=angular.isDefined(c.disabled)||!1,c.ngDisabled&&M.push(a.$parent.$watch(f(c.ngDisabled),function(b){a.disabled=b})),a.$watch("isOpen",function(d){d?a.disabled?a.isOpen=!1:n(function(){w(),A&&a.$broadcast("uib:datepicker.focus"),h.on("click",u);var d=c.popupPlacement?c.popupPlacement:m.placement;z||j.parsePlacement(d)[2]?(F=F||angular.element(j.scrollParent(b)),F&&F.on("scroll",w)):F=null,angular.element(g).on("resize",w)},0,!1):(h.off("click",u),F&&F.off("scroll",w),angular.element(g).off("resize",w))}),a.$on("uib:datepicker.mode",function(){n(w,0,!1)})}]).directive("uibDatepickerPopup",function(){return{require:["ngModel","uibDatepickerPopup"],controller:"UibDatepickerPopupController",scope:{datepickerOptions:"=?",isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&",customClass:"&"},link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibDatepickerPopupWrap",function(){return{replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/popup.html"}}}),angular.module("ui.bootstrap.debounce",[]).factory("$$debounce",["$timeout",function(a){return function(b,c){var d;return function(){var e=this,f=Array.prototype.slice.call(arguments);d&&a.cancel(d),d=a(function(){b.apply(e,f)},c)}}}]),angular.module("ui.bootstrap.dropdown",["ui.bootstrap.position"]).constant("uibDropdownConfig",{appendToOpenClass:"uib-dropdown-open",openClass:"open"}).service("uibDropdownService",["$document","$rootScope",function(a,b){var c=null;this.open=function(b){c||(a.on("click",d),a.on("keydown",e)),c&&c!==b&&(c.isOpen=!1),c=b},this.close=function(b){c===b&&(c=null,a.off("click",d),a.off("keydown",e))};var d=function(a){if(c&&!(a&&"disabled"===c.getAutoClose()||a&&3===a.which)){var d=c.getToggleElement();if(!(a&&d&&d[0].contains(a.target))){var e=c.getDropdownElement();a&&"outsideClick"===c.getAutoClose()&&e&&e[0].contains(a.target)||(c.isOpen=!1,b.$$phase||c.$apply())}}},e=function(a){27===a.which?(c.focusToggleElement(),d()):c.isKeynavEnabled()&&-1!==[38,40].indexOf(a.which)&&c.isOpen&&(a.preventDefault(),a.stopPropagation(),c.focusDropdownEntry(a.which))}}]).controller("UibDropdownController",["$scope","$element","$attrs","$parse","uibDropdownConfig","uibDropdownService","$animate","$uibPosition","$document","$compile","$templateRequest",function(a,b,c,d,e,f,g,h,i,j,k){var l,m,n=this,o=a.$new(),p=e.appendToOpenClass,q=e.openClass,r=angular.noop,s=c.onToggle?d(c.onToggle):angular.noop,t=!1,u=null,v=!1,w=i.find("body");b.addClass("dropdown"),this.init=function(){if(c.isOpen&&(m=d(c.isOpen),r=m.assign,a.$watch(m,function(a){o.isOpen=!!a})),angular.isDefined(c.dropdownAppendTo)){var e=d(c.dropdownAppendTo)(o);e&&(u=angular.element(e))}t=angular.isDefined(c.dropdownAppendToBody),v=angular.isDefined(c.keyboardNav),t&&!u&&(u=w),u&&n.dropdownMenu&&(u.append(n.dropdownMenu),b.on("$destroy",function(){n.dropdownMenu.remove()}))},this.toggle=function(a){return o.isOpen=arguments.length?!!a:!o.isOpen,angular.isFunction(r)&&r(o,o.isOpen),o.isOpen},this.isOpen=function(){return o.isOpen},o.getToggleElement=function(){return n.toggleElement},o.getAutoClose=function(){return c.autoClose||"always"},o.getElement=function(){return b},o.isKeynavEnabled=function(){return v},o.focusDropdownEntry=function(a){var c=n.dropdownMenu?angular.element(n.dropdownMenu).find("a"):b.find("ul").eq(0).find("a");switch(a){case 40:angular.isNumber(n.selectedOption)?n.selectedOption=n.selectedOption===c.length-1?n.selectedOption:n.selectedOption+1:n.selectedOption=0;break;case 38:angular.isNumber(n.selectedOption)?n.selectedOption=0===n.selectedOption?0:n.selectedOption-1:n.selectedOption=c.length-1}c[n.selectedOption].focus()},o.getDropdownElement=function(){return n.dropdownMenu},o.focusToggleElement=function(){n.toggleElement&&n.toggleElement[0].focus()},o.$watch("isOpen",function(c,d){if(u&&n.dropdownMenu){var e,i,m=h.positionElements(b,n.dropdownMenu,"bottom-left",!0);if(e={top:m.top+"px",display:c?"block":"none"},i=n.dropdownMenu.hasClass("dropdown-menu-right"),i?(e.left="auto",e.right=window.innerWidth-(m.left+b.prop("offsetWidth"))+"px"):(e.left=m.left+"px",e.right="auto"),!t){var v=h.offset(u);e.top=m.top-v.top+"px",i?e.right=window.innerWidth-(m.left-v.left+b.prop("offsetWidth"))+"px":e.left=m.left-v.left+"px"}n.dropdownMenu.css(e)}var w=u?u:b,x=w.hasClass(u?p:q);if(x===!c&&g[c?"addClass":"removeClass"](w,u?p:q).then(function(){angular.isDefined(c)&&c!==d&&s(a,{open:!!c})}),c)n.dropdownMenuTemplateUrl&&k(n.dropdownMenuTemplateUrl).then(function(a){l=o.$new(),j(a.trim())(l,function(a){var b=a;n.dropdownMenu.replaceWith(b),n.dropdownMenu=b})}),o.focusToggleElement(),f.open(o);else{if(n.dropdownMenuTemplateUrl){l&&l.$destroy();var y=angular.element('
    ');n.dropdownMenu.replaceWith(y),n.dropdownMenu=y}f.close(o),n.selectedOption=null}angular.isFunction(r)&&r(a,c)}),a.$on("$locationChangeSuccess",function(){"disabled"!==o.getAutoClose()&&(o.isOpen=!1)})}]).directive("uibDropdown",function(){return{controller:"UibDropdownController",link:function(a,b,c,d){d.init()}}}).directive("uibDropdownMenu",function(){return{restrict:"A",require:"?^uibDropdown",link:function(a,b,c,d){if(d&&!angular.isDefined(c.dropdownNested)){b.addClass("dropdown-menu");var e=c.templateUrl;e&&(d.dropdownMenuTemplateUrl=e),d.dropdownMenu||(d.dropdownMenu=b)}}}}).directive("uibDropdownToggle",function(){return{require:"?^uibDropdown",link:function(a,b,c,d){if(d){b.addClass("dropdown-toggle"),d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.stackedMap",[]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c0&&(b=t.top().value,b.modalDomEl.toggleClass(b.windowTopClass||"",a))}function l(){if(p&&-1===i()){var a=q;m(p,q,function(){a=null}),p=void 0,q=void 0}}function m(b,c,d,e){function g(){g.done||(g.done=!0,a.leave(b).then(function(){b.remove(),e&&e.resolve()}),c.$destroy(),d&&d())}var h,i=null,j=function(){return h||(h=f.defer(),i=h.promise),function(){h.resolve()}};return c.$broadcast(v.NOW_CLOSING_EVENT,j),f.when(i).then(g)}function n(a){if(a.isDefaultPrevented())return a;var b=t.top();if(b)switch(a.which){case 27:b.value.keyboard&&(a.preventDefault(),e.$apply(function(){v.dismiss(b.key,"escape key press")}));break;case 9:v.loadFocusElementList(b);var c=!1;a.shiftKey?(v.isFocusInFirstItem(a)||v.isModalFocused(a,b))&&(c=v.focusLastFocusableElement()):v.isFocusInLastItem(a)&&(c=v.focusFirstFocusableElement()),c&&(a.preventDefault(),a.stopPropagation())}}function o(a,b,c){return!a.value.modalScope.$broadcast("modal.closing",b,c).defaultPrevented}var p,q,r,s="modal-open",t=h.createNew(),u=g.createNew(),v={NOW_CLOSING_EVENT:"modal.stack.now-closing"},w=0,x="a[href], area[href], input:not([disabled]), button:not([disabled]),select:not([disabled]), textarea:not([disabled]), iframe, object, embed, *[tabindex], *[contenteditable=true]";return e.$watch(i,function(a){q&&(q.index=a)}),c.on("keydown",n),e.$on("$destroy",function(){c.off("keydown",n)}),v.open=function(b,f){var g=c[0].activeElement,h=f.openedClass||s;k(!1),t.add(b,{deferred:f.deferred,renderDeferred:f.renderDeferred,closedDeferred:f.closedDeferred,modalScope:f.scope,backdrop:f.backdrop,keyboard:f.keyboard,openedClass:f.openedClass,windowTopClass:f.windowTopClass,animation:f.animation,appendTo:f.appendTo}),u.put(h,b);var j=f.appendTo,l=i();if(!j.length)throw new Error("appendTo element not found. Make sure that the element passed is in DOM.");l>=0&&!p&&(q=e.$new(!0),q.modalOptions=f,q.index=l,p=angular.element('
    '),p.attr("backdrop-class",f.backdropClass),f.animation&&p.attr("modal-animation","true"),d(p)(q),a.enter(p,j));var m=angular.element('
    ');m.attr({"template-url":f.windowTemplateUrl,"window-class":f.windowClass,"window-top-class":f.windowTopClass,size:f.size,index:t.length()-1,animate:"animate"}).html(f.content),f.animation&&m.attr("modal-animation","true"),a.enter(d(m)(f.scope),j).then(function(){f.scope.$$uibDestructionScheduled||a.addClass(j,h)}),t.top().value.modalDomEl=m,t.top().value.modalOpener=g,v.clearFocusListCache()},v.close=function(a,b){var c=t.get(a);return c&&o(c,b,!0)?(c.value.modalScope.$$uibDestructionScheduled=!0,c.value.deferred.resolve(b),j(a,c.value.modalOpener),!0):!c},v.dismiss=function(a,b){var c=t.get(a);return c&&o(c,b,!1)?(c.value.modalScope.$$uibDestructionScheduled=!0,c.value.deferred.reject(b),j(a,c.value.modalOpener),!0):!c},v.dismissAll=function(a){for(var b=this.getTop();b&&this.dismiss(b.key,a);)b=this.getTop()},v.getTop=function(){return t.top()},v.modalRendered=function(a){var b=t.get(a);b&&b.value.renderDeferred.resolve()},v.focusFirstFocusableElement=function(){return r.length>0?(r[0].focus(),!0):!1},v.focusLastFocusableElement=function(){return r.length>0?(r[r.length-1].focus(),!0):!1},v.isModalFocused=function(a,b){if(a&&b){var c=b.value.modalDomEl;if(c&&c.length)return(a.target||a.srcElement)===c[0]}return!1},v.isFocusInFirstItem=function(a){return r.length>0?(a.target||a.srcElement)===r[0]:!1},v.isFocusInLastItem=function(a){return r.length>0?(a.target||a.srcElement)===r[r.length-1]:!1},v.clearFocusListCache=function(){r=[],w=0},v.loadFocusElementList=function(a){if((void 0===r||!r.length)&&a){var b=a.value.modalDomEl;b&&b.length&&(r=b[0].querySelectorAll(x))}},v}]).provider("$uibModal",function(){var a={options:{animation:!0,backdrop:!0,keyboard:!0},$get:["$rootScope","$q","$document","$templateRequest","$controller","$uibResolve","$uibModalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?c.when(a.template):e(angular.isFunction(a.templateUrl)?a.templateUrl():a.templateUrl)}var j={},k=null;return j.getPromiseChain=function(){return k},j.open=function(e){function j(){return r}var l=c.defer(),m=c.defer(),n=c.defer(),o=c.defer(),p={result:l.promise,opened:m.promise,closed:n.promise,rendered:o.promise,close:function(a){return h.close(p,a)},dismiss:function(a){return h.dismiss(p,a)}};if(e=angular.extend({},a.options,e),e.resolve=e.resolve||{},e.appendTo=e.appendTo||d.find("body").eq(0),!e.template&&!e.templateUrl)throw new Error("One of template or templateUrl options is required.");var q,r=c.all([i(e),g.resolve(e.resolve,{},null,null)]);return q=k=c.all([k]).then(j,j).then(function(a){var c=e.scope||b,d=c.$new();d.$close=p.close,d.$dismiss=p.dismiss,d.$on("$destroy",function(){d.$$uibDestructionScheduled||d.$dismiss("$uibUnscheduledDestruction")});var g,i,j={};e.controller&&(j.$scope=d,j.$uibModalInstance=p,angular.forEach(a[1],function(a,b){j[b]=a}),i=f(e.controller,j,!0),e.controllerAs?(g=i.instance,e.bindToController&&(g.$close=d.$close,g.$dismiss=d.$dismiss,angular.extend(g,c)),g=i(),d[e.controllerAs]=g):g=i(),angular.isFunction(g.$onInit)&&g.$onInit()),h.open(p,{scope:d,deferred:l,renderDeferred:o,closedDeferred:n,content:a[0],animation:e.animation,backdrop:e.backdrop,keyboard:e.keyboard,backdropClass:e.backdropClass,windowTopClass:e.windowTopClass,windowClass:e.windowClass,windowTemplateUrl:e.windowTemplateUrl,size:e.size,openedClass:e.openedClass,appendTo:e.appendTo}),m.resolve(!0)},function(a){m.reject(a),l.reject(a)})["finally"](function(){k===q&&(k=null)}),p},j}]};return a}),angular.module("ui.bootstrap.paging",[]).factory("uibPaging",["$parse",function(a){return{create:function(b,c,d){b.setNumPages=d.numPages?a(d.numPages).assign:angular.noop,b.ngModelCtrl={$setViewValue:angular.noop},b._watchers=[],b.init=function(a,e){b.ngModelCtrl=a,b.config=e,a.$render=function(){b.render()},d.itemsPerPage?b._watchers.push(c.$parent.$watch(d.itemsPerPage,function(a){b.itemsPerPage=parseInt(a,10),c.totalPages=b.calculateTotalPages(),b.updatePage()})):b.itemsPerPage=e.itemsPerPage,c.$watch("totalItems",function(a,d){(angular.isDefined(a)||a!==d)&&(c.totalPages=b.calculateTotalPages(),b.updatePage())})},b.calculateTotalPages=function(){var a=b.itemsPerPage<1?1:Math.ceil(c.totalItems/b.itemsPerPage);return Math.max(a||0,1)},b.render=function(){c.page=parseInt(b.ngModelCtrl.$viewValue,10)||1},c.selectPage=function(a,d){d&&d.preventDefault();var e=!c.ngDisabled||!d;e&&c.page!==a&&a>0&&a<=c.totalPages&&(d&&d.target&&d.target.blur(),b.ngModelCtrl.$setViewValue(a),b.ngModelCtrl.$render())},c.getText=function(a){return c[a+"Text"]||b.config[a+"Text"]},c.noPrevious=function(){return 1===c.page},c.noNext=function(){return c.page===c.totalPages},b.updatePage=function(){b.setNumPages(c.$parent,c.totalPages),c.page>c.totalPages?c.selectPage(c.totalPages):b.ngModelCtrl.$render()},c.$on("$destroy",function(){for(;b._watchers.length;)b._watchers.shift()()})}}}]),angular.module("ui.bootstrap.pager",["ui.bootstrap.paging"]).controller("UibPagerController",["$scope","$attrs","uibPaging","uibPagerConfig",function(a,b,c,d){a.align=angular.isDefined(b.align)?a.$parent.$eval(b.align):d.align,c.create(this,a,b)}]).constant("uibPagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("uibPager",["uibPagerConfig",function(a){return{scope:{totalItems:"=",previousText:"@",nextText:"@",ngDisabled:"="},require:["uibPager","?ngModel"],controller:"UibPagerController",controllerAs:"pager",templateUrl:function(a,b){return b.templateUrl||"uib/template/pager/pager.html"},replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&f.init(g,a)}}}]),angular.module("ui.bootstrap.pagination",["ui.bootstrap.paging"]).controller("UibPaginationController",["$scope","$attrs","$parse","uibPaging","uibPaginationConfig",function(a,b,c,d,e){function f(a,b,c){return{number:a,text:b,active:c}}function g(a,b){var c=[],d=1,e=b,g=angular.isDefined(i)&&b>i;g&&(j?(d=Math.max(a-Math.floor(i/2),1),e=d+i-1,e>b&&(e=b,d=e-i+1)):(d=(Math.ceil(a/i)-1)*i+1,e=Math.min(d+i-1,b)));for(var h=d;e>=h;h++){var n=f(h,m(h),h===a);c.push(n)}if(g&&i>0&&(!j||k||l)){if(d>1){if(!l||d>3){var o=f(d-1,"...",!1);c.unshift(o)}if(l){if(3===d){var p=f(2,"2",!1);c.unshift(p)}var q=f(1,"1",!1); +c.unshift(q)}}if(b>e){if(!l||b-2>e){var r=f(e+1,"...",!1);c.push(r)}if(l){if(e===b-2){var s=f(b-1,b-1,!1);c.push(s)}var t=f(b,b,!1);c.push(t)}}}return c}var h=this,i=angular.isDefined(b.maxSize)?a.$parent.$eval(b.maxSize):e.maxSize,j=angular.isDefined(b.rotate)?a.$parent.$eval(b.rotate):e.rotate,k=angular.isDefined(b.forceEllipses)?a.$parent.$eval(b.forceEllipses):e.forceEllipses,l=angular.isDefined(b.boundaryLinkNumbers)?a.$parent.$eval(b.boundaryLinkNumbers):e.boundaryLinkNumbers,m=angular.isDefined(b.pageLabel)?function(c){return a.$parent.$eval(b.pageLabel,{$page:c})}:angular.identity;a.boundaryLinks=angular.isDefined(b.boundaryLinks)?a.$parent.$eval(b.boundaryLinks):e.boundaryLinks,a.directionLinks=angular.isDefined(b.directionLinks)?a.$parent.$eval(b.directionLinks):e.directionLinks,d.create(this,a,b),b.maxSize&&h._watchers.push(a.$parent.$watch(c(b.maxSize),function(a){i=parseInt(a,10),h.render()}));var n=this.render;this.render=function(){n(),a.page>0&&a.page<=a.totalPages&&(a.pages=g(a.page,a.totalPages))}}]).constant("uibPaginationConfig",{itemsPerPage:10,boundaryLinks:!1,boundaryLinkNumbers:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0,forceEllipses:!1}).directive("uibPagination",["$parse","uibPaginationConfig",function(a,b){return{scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@",ngDisabled:"="},require:["uibPagination","?ngModel"],controller:"UibPaginationController",controllerAs:"pagination",templateUrl:function(a,b){return b.templateUrl||"uib/template/pagination/pagination.html"},replace:!0,link:function(a,c,d,e){var f=e[0],g=e[1];g&&f.init(g,b)}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.stackedMap"]).provider("$uibTooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",placementClassPrefix:"",animation:!0,popupDelay:0,popupCloseDelay:0,useContentExp:!1},c={mouseenter:"mouseleave",click:"click",outsideClick:"outsideClick",focus:"blur",none:""},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$document","$uibPosition","$interpolate","$rootScope","$parse","$$stackedMap",function(e,f,g,h,i,j,k,l,m){function n(a){if(27===a.which){var b=o.top();b&&(b.value.close(),o.removeTop(),b=null)}}var o=m.createNew();return h.on("keypress",n),k.$on("$destroy",function(){h.off("keypress",n)}),function(e,k,m,n){function p(a){var b=(a||n.trigger||m).split(" "),d=b.map(function(a){return c[a]||a});return{show:b,hide:d}}n=angular.extend({},b,d,n);var q=a(e),r=j.startSymbol(),s=j.endSymbol(),t="
    ';return{compile:function(a,b){var c=f(t);return function(a,b,d,f){function j(){N.isOpen?q():m()}function m(){(!M||a.$eval(d[k+"Enable"]))&&(u(),x(),N.popupDelay?G||(G=g(r,N.popupDelay,!1)):r())}function q(){s(),N.popupCloseDelay?H||(H=g(t,N.popupCloseDelay,!1)):t()}function r(){return s(),u(),N.content?(v(),void N.$evalAsync(function(){N.isOpen=!0,y(!0),S()})):angular.noop}function s(){G&&(g.cancel(G),G=null),I&&(g.cancel(I),I=null)}function t(){N&&N.$evalAsync(function(){N&&(N.isOpen=!1,y(!1),N.animation?F||(F=g(w,150,!1)):w())})}function u(){H&&(g.cancel(H),H=null),F&&(g.cancel(F),F=null)}function v(){D||(E=N.$new(),D=c(E,function(a){K?h.find("body").append(a):b.after(a)}),z())}function w(){s(),u(),A(),D&&(D.remove(),D=null),E&&(E.$destroy(),E=null)}function x(){N.title=d[k+"Title"],Q?N.content=Q(a):N.content=d[e],N.popupClass=d[k+"Class"],N.placement=angular.isDefined(d[k+"Placement"])?d[k+"Placement"]:n.placement;var b=i.parsePlacement(N.placement);J=b[1]?b[0]+"-"+b[1]:b[0];var c=parseInt(d[k+"PopupDelay"],10),f=parseInt(d[k+"PopupCloseDelay"],10);N.popupDelay=isNaN(c)?n.popupDelay:c,N.popupCloseDelay=isNaN(f)?n.popupCloseDelay:f}function y(b){P&&angular.isFunction(P.assign)&&P.assign(a,b)}function z(){R.length=0,Q?(R.push(a.$watch(Q,function(a){N.content=a,!a&&N.isOpen&&t()})),R.push(E.$watch(function(){O||(O=!0,E.$$postDigest(function(){O=!1,N&&N.isOpen&&S()}))}))):R.push(d.$observe(e,function(a){N.content=a,!a&&N.isOpen?t():S()})),R.push(d.$observe(k+"Title",function(a){N.title=a,N.isOpen&&S()})),R.push(d.$observe(k+"Placement",function(a){N.placement=a?a:n.placement;var b=i.parsePlacement(N.placement);J=b[1]?b[0]+"-"+b[1]:b[0],N.isOpen&&S()}))}function A(){R.length&&(angular.forEach(R,function(a){a()}),R.length=0)}function B(a){N&&N.isOpen&&D&&(b[0].contains(a.target)||D[0].contains(a.target)||q())}function C(){var a=d[k+"Trigger"];T(),L=p(a),"none"!==L.show&&L.show.forEach(function(a,c){"outsideClick"===a?(b.on("click",j),h.on("click",B)):a===L.hide[c]?b.on(a,j):a&&(b.on(a,m),b.on(L.hide[c],q)),b.on("keypress",function(a){27===a.which&&q()})})}var D,E,F,G,H,I,J,K=angular.isDefined(n.appendToBody)?n.appendToBody:!1,L=p(void 0),M=angular.isDefined(d[k+"Enable"]),N=a.$new(!0),O=!1,P=angular.isDefined(d[k+"IsOpen"])?l(d[k+"IsOpen"]):!1,Q=n.useContentExp?l(d[e]):!1,R=[],S=function(){D&&D.html()&&(I||(I=g(function(){var a=i.positionElements(b,D,N.placement,K);D.css({top:a.top+"px",left:a.left+"px"}),D.hasClass(a.placement.split("-")[0])||(D.removeClass(J.split("-")[0]),D.addClass(a.placement.split("-")[0])),D.hasClass(n.placementClassPrefix+a.placement)||(D.removeClass(n.placementClassPrefix+J),D.addClass(n.placementClassPrefix+a.placement)),D.hasClass("uib-position-measure")?(i.positionArrow(D,a.placement),D.removeClass("uib-position-measure")):J!==a.placement&&i.positionArrow(D,a.placement),J=a.placement,I=null},0,!1)))};N.origScope=a,N.isOpen=!1,o.add(N,{close:t}),N.contentExp=function(){return N.content},d.$observe("disabled",function(a){a&&s(),a&&N.isOpen&&t()}),P&&a.$watch(P,function(a){N&&!a===N.isOpen&&j()});var T=function(){L.show.forEach(function(a){"outsideClick"===a?b.off("click",j):(b.off(a,m),b.off(a,j))}),L.hide.forEach(function(a){"outsideClick"===a?h.off("click",B):b.off(a,q)})};C();var U=a.$eval(d[k+"Animation"]);N.animation=angular.isDefined(U)?!!U:n.animation;var V,W=k+"AppendToBody";V=W in d&&void 0===d[W]?!0:a.$eval(d[W]),K=angular.isDefined(V)?V:K,a.$on("$destroy",function(){T(),w(),o.remove(N),N=null})}}}}}]}).directive("uibTooltipTemplateTransclude",["$animate","$sce","$compile","$templateRequest",function(a,b,c,d){return{link:function(e,f,g){var h,i,j,k=e.$eval(g.tooltipTemplateTranscludeScope),l=0,m=function(){i&&(i.remove(),i=null),h&&(h.$destroy(),h=null),j&&(a.leave(j).then(function(){i=null}),i=j,j=null)};e.$watch(b.parseAsResourceUrl(g.uibTooltipTemplateTransclude),function(b){var g=++l;b?(d(b,!0).then(function(d){if(g===l){var e=k.$new(),i=d,n=c(i)(e,function(b){m(),a.enter(b,f)});h=e,j=n,h.$emit("$includeContentLoaded",b)}},function(){g===l&&(m(),e.$emit("$includeContentError",b))}),e.$emit("$includeContentRequested",b)):m()}),e.$on("$destroy",m)}}}]).directive("uibTooltipClasses",["$uibPosition",function(a){return{restrict:"A",link:function(b,c,d){if(b.placement){var e=a.parsePlacement(b.placement);c.addClass(e[0])}b.popupClass&&c.addClass(b.popupClass),b.animation()&&c.addClass(d.tooltipAnimationClass)}}}]).directive("uibTooltipPopup",function(){return{replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/tooltip/tooltip-popup.html"}}).directive("uibTooltip",["$uibTooltip",function(a){return a("uibTooltip","tooltip","mouseenter")}]).directive("uibTooltipTemplatePopup",function(){return{replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"uib/template/tooltip/tooltip-template-popup.html"}}).directive("uibTooltipTemplate",["$uibTooltip",function(a){return a("uibTooltipTemplate","tooltip","mouseenter",{useContentExp:!0})}]).directive("uibTooltipHtmlPopup",function(){return{replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/tooltip/tooltip-html-popup.html"}}).directive("uibTooltipHtml",["$uibTooltip",function(a){return a("uibTooltipHtml","tooltip","mouseenter",{useContentExp:!0})}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("uibPopoverTemplatePopup",function(){return{replace:!0,scope:{title:"@",contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"uib/template/popover/popover-template.html"}}).directive("uibPopoverTemplate",["$uibTooltip",function(a){return a("uibPopoverTemplate","popover","click",{useContentExp:!0})}]).directive("uibPopoverHtmlPopup",function(){return{replace:!0,scope:{contentExp:"&",title:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/popover/popover-html.html"}}).directive("uibPopoverHtml",["$uibTooltip",function(a){return a("uibPopoverHtml","popover","click",{useContentExp:!0})}]).directive("uibPopoverPopup",function(){return{replace:!0,scope:{title:"@",content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/popover/popover.html"}}).directive("uibPopover",["$uibTooltip",function(a){return a("uibPopover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("uibProgressConfig",{animate:!0,max:100}).controller("UibProgressController",["$scope","$attrs","uibProgressConfig",function(a,b,c){function d(){return angular.isDefined(a.maxParam)?a.maxParam:c.max}var e=this,f=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=d(),this.addBar=function(a,b,c){f||b.css({transition:"none"}),this.bars.push(a),a.max=d(),a.title=c&&angular.isDefined(c.title)?c.title:"progressbar",a.$watch("value",function(b){a.recalculatePercentage()}),a.recalculatePercentage=function(){var b=e.bars.reduce(function(a,b){return b.percent=+(100*b.value/b.max).toFixed(2),a+b.percent},0);b>100&&(a.percent-=b-100)},a.$on("$destroy",function(){b=null,e.removeBar(a)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1),this.bars.forEach(function(a){a.recalculatePercentage()})},a.$watch("maxParam",function(a){e.bars.forEach(function(a){a.max=d(),a.recalculatePercentage()})})}]).directive("uibProgress",function(){return{replace:!0,transclude:!0,controller:"UibProgressController",require:"uibProgress",scope:{maxParam:"=?max"},templateUrl:"uib/template/progressbar/progress.html"}}).directive("uibBar",function(){return{replace:!0,transclude:!0,require:"^uibProgress",scope:{value:"=",type:"@"},templateUrl:"uib/template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b,c)}}}).directive("uibProgressbar",function(){return{replace:!0,transclude:!0,controller:"UibProgressController",scope:{value:"=",maxParam:"=?max",type:"@"},templateUrl:"uib/template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]),{title:c.title})}}}),angular.module("ui.bootstrap.rating",[]).constant("uibRatingConfig",{max:5,stateOn:null,stateOff:null,titles:["one","two","three","four","five"]}).controller("UibRatingController",["$scope","$attrs","uibRatingConfig",function(a,b,c){var d={$setViewValue:angular.noop},e=this;this.init=function(e){d=e,d.$render=this.render,d.$formatters.push(function(a){return angular.isNumber(a)&&a<<0!==a&&(a=Math.round(a)),a}),this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.titles)?a.$parent.$eval(b.titles):c.titles;this.titles=angular.isArray(f)&&f.length>0?f:c.titles;var g=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(g)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff,title:this.getTitle(b)},a[b]);return a},this.getTitle=function(a){return a>=this.titles.length?a+1:this.titles[a]},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(d.$viewValue===b?0:b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue,a.title=e.getTitle(a.value-1)}}]).directive("uibRating",function(){return{require:["uibRating","ngModel"],scope:{readonly:"=?readOnly",onHover:"&",onLeave:"&"},controller:"UibRatingController",templateUrl:"uib/template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("UibTabsetController",["$scope",function(a){function b(a){for(var b=0;bb.index?1:a.index0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===u[1]&&(b+=12)),b):void 0}function i(){var b=+a.minutes;return b>=0&&60>b?b:void 0}function j(){var b=+a.seconds;return b>=0&&60>b?b:void 0}function k(a){return null===a?"":angular.isDefined(a)&&a.toString().length<2?"0"+a:a.toString()}function l(a){m(),t.$setViewValue(new Date(r)),n(a)}function m(){t.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1,a.invalidSeconds=!1}function n(b){if(t.$modelValue){var c=r.getHours(),d=r.getMinutes(),e=r.getSeconds();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:k(c),"m"!==b&&(a.minutes=k(d)),a.meridian=r.getHours()<12?u[0]:u[1],"s"!==b&&(a.seconds=k(e)),a.meridian=r.getHours()<12?u[0]:u[1]}else a.hours=null,a.minutes=null,a.seconds=null,a.meridian=u[0]}function o(a){r=q(r,a),l()}function p(a,b){return q(a,60*b)}function q(a,b){var c=new Date(a.getTime()+1e3*b),d=new Date(a);return d.setHours(c.getHours(),c.getMinutes(),c.getSeconds()),d}var r=new Date,s=[],t={$setViewValue:angular.noop},u=angular.isDefined(c.meridians)?a.$parent.$eval(c.meridians):g.meridians||f.DATETIME_FORMATS.AMPMS;a.tabindex=angular.isDefined(c.tabindex)?c.tabindex:0,b.removeAttr("tabindex"),this.init=function(b,d){t=b,t.$render=this.render,t.$formatters.unshift(function(a){return a?new Date(a):null});var e=d.eq(0),f=d.eq(1),h=d.eq(2),i=angular.isDefined(c.mousewheel)?a.$parent.$eval(c.mousewheel):g.mousewheel;i&&this.setupMousewheelEvents(e,f,h);var j=angular.isDefined(c.arrowkeys)?a.$parent.$eval(c.arrowkeys):g.arrowkeys;j&&this.setupArrowkeyEvents(e,f,h),a.readonlyInput=angular.isDefined(c.readonlyInput)?a.$parent.$eval(c.readonlyInput):g.readonlyInput,this.setupInputEvents(e,f,h)};var v=g.hourStep;c.hourStep&&s.push(a.$parent.$watch(d(c.hourStep),function(a){v=+a}));var w=g.minuteStep;c.minuteStep&&s.push(a.$parent.$watch(d(c.minuteStep),function(a){w=+a}));var x;s.push(a.$parent.$watch(d(c.min),function(a){var b=new Date(a);x=isNaN(b)?void 0:b}));var y;s.push(a.$parent.$watch(d(c.max),function(a){var b=new Date(a);y=isNaN(b)?void 0:b}));var z=!1;c.ngDisabled&&s.push(a.$parent.$watch(d(c.ngDisabled),function(a){z=a})),a.noIncrementHours=function(){var a=p(r,60*v);return z||a>y||r>a&&x>a},a.noDecrementHours=function(){var a=p(r,60*-v);return z||x>a||a>r&&a>y},a.noIncrementMinutes=function(){var a=p(r,w);return z||a>y||r>a&&x>a},a.noDecrementMinutes=function(){var a=p(r,-w);return z||x>a||a>r&&a>y},a.noIncrementSeconds=function(){var a=q(r,A);return z||a>y||r>a&&x>a},a.noDecrementSeconds=function(){var a=q(r,-A);return z||x>a||a>r&&a>y},a.noToggleMeridian=function(){return r.getHours()<12?z||p(r,720)>y:z||p(r,-720)0};b.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()}),d.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementSeconds():a.decrementSeconds()),b.preventDefault()})},this.setupArrowkeyEvents=function(b,c,d){b.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementHours(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementHours(),a.$apply()))}),c.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementMinutes(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementMinutes(),a.$apply()))}),d.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementSeconds(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementSeconds(),a.$apply()))})},this.setupInputEvents=function(b,c,d){if(a.readonlyInput)return a.updateHours=angular.noop,a.updateMinutes=angular.noop,void(a.updateSeconds=angular.noop);var e=function(b,c,d){t.$setViewValue(null),t.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c),angular.isDefined(d)&&(a.invalidSeconds=d)};a.updateHours=function(){var a=h(),b=i();t.$setDirty(),angular.isDefined(a)&&angular.isDefined(b)?(r.setHours(a),r.setMinutes(b),x>r||r>y?e(!0):l("h")):e(!0)},b.bind("blur",function(b){t.$setTouched(),null===a.hours||""===a.hours?e(!0):!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=k(a.hours)})}),a.updateMinutes=function(){var a=i(),b=h();t.$setDirty(),angular.isDefined(a)&&angular.isDefined(b)?(r.setHours(b),r.setMinutes(a),x>r||r>y?e(void 0,!0):l("m")):e(void 0,!0)},c.bind("blur",function(b){t.$setTouched(),null===a.minutes?e(void 0,!0):!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=k(a.minutes)})}),a.updateSeconds=function(){var a=j();t.$setDirty(),angular.isDefined(a)?(r.setSeconds(a),l("s")):e(void 0,void 0,!0)},d.bind("blur",function(b){!a.invalidSeconds&&a.seconds<10&&a.$apply(function(){a.seconds=k(a.seconds)})})},this.render=function(){var b=t.$viewValue;isNaN(b)?(t.$setValidity("time",!1),e.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(b&&(r=b),x>r||r>y?(t.$setValidity("time",!1),a.invalidHours=!0,a.invalidMinutes=!0):m(),n())},a.showSpinners=angular.isDefined(c.showSpinners)?a.$parent.$eval(c.showSpinners):g.showSpinners,a.incrementHours=function(){a.noIncrementHours()||o(60*v*60)},a.decrementHours=function(){a.noDecrementHours()||o(60*-v*60)},a.incrementMinutes=function(){a.noIncrementMinutes()||o(60*w)},a.decrementMinutes=function(){a.noDecrementMinutes()||o(60*-w)},a.incrementSeconds=function(){a.noIncrementSeconds()||o(A)},a.decrementSeconds=function(){a.noDecrementSeconds()||o(-A)},a.toggleMeridian=function(){var b=i(),c=h();a.noToggleMeridian()||(angular.isDefined(b)&&angular.isDefined(c)?o(720*(r.getHours()<12?60:-60)):a.meridian=a.meridian===u[0]?u[1]:u[0])},a.blur=function(){t.$setTouched()},a.$on("$destroy",function(){for(;s.length;)s.shift()()})}]).directive("uibTimepicker",["uibTimepickerConfig",function(a){return{require:["uibTimepicker","?^ngModel"],controller:"UibTimepickerController",controllerAs:"timepicker",replace:!0,scope:{},templateUrl:function(b,c){return c.templateUrl||a.templateUrl},link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}]),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.debounce","ui.bootstrap.position"]).factory("uibTypeaheadParser",["$parse",function(a){var b=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).controller("UibTypeaheadController",["$scope","$element","$attrs","$compile","$parse","$q","$timeout","$document","$window","$rootScope","$$debounce","$uibPosition","uibTypeaheadParser",function(a,b,c,d,e,f,g,h,i,j,k,l,m){function n(){N.moveInProgress||(N.moveInProgress=!0,N.$digest()),Y()}function o(){N.position=D?l.offset(b):l.position(b),N.position.top+=b.prop("offsetHeight")}var p,q,r=[9,13,27,38,40],s=200,t=a.$eval(c.typeaheadMinLength);t||0===t||(t=1),a.$watch(c.typeaheadMinLength,function(a){t=a||0===a?a:1});var u=a.$eval(c.typeaheadWaitMs)||0,v=a.$eval(c.typeaheadEditable)!==!1;a.$watch(c.typeaheadEditable,function(a){v=a!==!1});var w,x,y=e(c.typeaheadLoading).assign||angular.noop,z=e(c.typeaheadOnSelect),A=angular.isDefined(c.typeaheadSelectOnBlur)?a.$eval(c.typeaheadSelectOnBlur):!1,B=e(c.typeaheadNoResults).assign||angular.noop,C=c.typeaheadInputFormatter?e(c.typeaheadInputFormatter):void 0,D=c.typeaheadAppendToBody?a.$eval(c.typeaheadAppendToBody):!1,E=c.typeaheadAppendTo?a.$eval(c.typeaheadAppendTo):null,F=a.$eval(c.typeaheadFocusFirst)!==!1,G=c.typeaheadSelectOnExact?a.$eval(c.typeaheadSelectOnExact):!1,H=e(c.typeaheadIsOpen).assign||angular.noop,I=a.$eval(c.typeaheadShowHint)||!1,J=e(c.ngModel),K=e(c.ngModel+"($$$p)"),L=function(b,c){return angular.isFunction(J(a))&&q&&q.$options&&q.$options.getterSetter?K(b,{$$$p:c}):J.assign(b,c)},M=m.parse(c.uibTypeahead),N=a.$new(),O=a.$on("$destroy",function(){N.$destroy()});N.$on("$destroy",O);var P="typeahead-"+N.$id+"-"+Math.floor(1e4*Math.random());b.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":P});var Q,R;I&&(Q=angular.element("
    "),Q.css("position","relative"),b.after(Q),R=b.clone(),R.attr("placeholder",""),R.attr("tabindex","-1"),R.val(""),R.css({position:"absolute",top:"0px",left:"0px","border-color":"transparent","box-shadow":"none",opacity:1,background:"none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)",color:"#999"}),b.css({position:"relative","vertical-align":"top","background-color":"transparent"}),Q.append(R),R.after(b));var S=angular.element("
    ");S.attr({id:P,matches:"matches",active:"activeIdx",select:"select(activeIdx, evt)","move-in-progress":"moveInProgress",query:"query",position:"position","assign-is-open":"assignIsOpen(isOpen)",debounce:"debounceUpdate"}),angular.isDefined(c.typeaheadTemplateUrl)&&S.attr("template-url",c.typeaheadTemplateUrl),angular.isDefined(c.typeaheadPopupTemplateUrl)&&S.attr("popup-template-url",c.typeaheadPopupTemplateUrl);var T=function(){I&&R.val("")},U=function(){N.matches=[],N.activeIdx=-1,b.attr("aria-expanded",!1),T()},V=function(a){return P+"-option-"+a};N.$watch("activeIdx",function(a){0>a?b.removeAttr("aria-activedescendant"):b.attr("aria-activedescendant",V(a))});var W=function(a,b){return N.matches.length>b&&a?a.toUpperCase()===N.matches[b].label.toUpperCase():!1},X=function(c,d){var e={$viewValue:c};y(a,!0),B(a,!1),f.when(M.source(a,e)).then(function(f){var g=c===p.$viewValue;if(g&&w)if(f&&f.length>0){N.activeIdx=F?0:-1,B(a,!1),N.matches.length=0;for(var h=0;h0&&i.slice(0,c.length).toUpperCase()===c.toUpperCase()?R.val(c+i.slice(c.length)):R.val("")}}else U(),B(a,!0);g&&y(a,!1)},function(){U(),y(a,!1),B(a,!0)})};D&&(angular.element(i).on("resize",n),h.find("body").on("scroll",n));var Y=k(function(){N.matches.length&&o(),N.moveInProgress=!1},s);N.moveInProgress=!1,N.query=void 0;var Z,$=function(a){Z=g(function(){X(a)},u)},_=function(){Z&&g.cancel(Z)};U(),N.assignIsOpen=function(b){H(a,b)},N.select=function(d,e){var f,h,i={};x=!0,i[M.itemName]=h=N.matches[d].model,f=M.modelMapper(a,i),L(a,f),p.$setValidity("editable",!0),p.$setValidity("parse",!0),z(a,{$item:h,$model:f,$label:M.viewMapper(a,i),$event:e}),U(),N.$eval(c.typeaheadFocusOnSelect)!==!1&&g(function(){b[0].focus()},0,!1)},b.on("keydown",function(b){if(0!==N.matches.length&&-1!==r.indexOf(b.which)){if(-1===N.activeIdx&&(9===b.which||13===b.which)||9===b.which&&b.shiftKey)return U(),void N.$digest();b.preventDefault();var c;switch(b.which){case 9:case 13:N.$apply(function(){angular.isNumber(N.debounceUpdate)||angular.isObject(N.debounceUpdate)?k(function(){N.select(N.activeIdx,b)},angular.isNumber(N.debounceUpdate)?N.debounceUpdate:N.debounceUpdate["default"]):N.select(N.activeIdx,b)});break;case 27:b.stopPropagation(),U(),a.$digest();break;case 38:N.activeIdx=(N.activeIdx>0?N.activeIdx:N.matches.length)-1,N.$digest(),c=S.find("li")[N.activeIdx],c.parentNode.scrollTop=c.offsetTop;break;case 40:N.activeIdx=(N.activeIdx+1)%N.matches.length,N.$digest(),c=S.find("li")[N.activeIdx],c.parentNode.scrollTop=c.offsetTop}}}),b.bind("focus",function(a){w=!0,0!==t||p.$viewValue||g(function(){X(p.$viewValue,a)},0)}),b.bind("blur",function(a){A&&N.matches.length&&-1!==N.activeIdx&&!x&&(x=!0,N.$apply(function(){angular.isObject(N.debounceUpdate)&&angular.isNumber(N.debounceUpdate.blur)?k(function(){N.select(N.activeIdx,a)},N.debounceUpdate.blur):N.select(N.activeIdx,a)})),!v&&p.$error.editable&&(p.$viewValue="",b.val("")),w=!1,x=!1});var aa=function(c){b[0]!==c.target&&3!==c.which&&0!==N.matches.length&&(U(),j.$$phase||a.$digest())};h.on("click",aa),a.$on("$destroy",function(){h.off("click",aa),(D||E)&&ba.remove(),D&&(angular.element(i).off("resize",n),h.find("body").off("scroll",n)),S.remove(),I&&Q.remove()});var ba=d(S)(N);D?h.find("body").append(ba):E?angular.element(E).eq(0).append(ba):b.after(ba),this.init=function(b,c){p=b,q=c,N.debounceUpdate=p.$options&&e(p.$options.debounce)(a),p.$parsers.unshift(function(b){return w=!0,0===t||b&&b.length>=t?u>0?(_(),$(b)):X(b):(y(a,!1),_(),U()),v?b:b?void p.$setValidity("editable",!1):(p.$setValidity("editable",!0),null)}),p.$formatters.push(function(b){var c,d,e={};return v||p.$setValidity("editable",!0),C?(e.$model=b,C(a,e)):(e[M.itemName]=b,c=M.viewMapper(a,e),e[M.itemName]=void 0,d=M.viewMapper(a,e),c!==d?c:b)})}}]).directive("uibTypeahead",function(){return{controller:"UibTypeaheadController",require:["ngModel","^?ngModelOptions","uibTypeahead"],link:function(a,b,c,d){d[2].init(d[0],d[1])}}}).directive("uibTypeaheadPopup",["$$debounce",function(a){return{scope:{matches:"=",query:"=",active:"=",position:"&",moveInProgress:"=",select:"&",assignIsOpen:"&",debounce:"&"},replace:!0,templateUrl:function(a,b){return b.popupTemplateUrl||"uib/template/typeahead/typeahead-popup.html"},link:function(b,c,d){b.templateUrl=d.templateUrl,b.isOpen=function(){var a=b.matches.length>0;return b.assignIsOpen({isOpen:a}),a},b.isActive=function(a){return b.active===a},b.selectActive=function(a){b.active=a},b.selectMatch=function(c,d){var e=b.debounce();angular.isNumber(e)||angular.isObject(e)?a(function(){b.select({activeIdx:c,evt:d})},angular.isNumber(e)?e:e["default"]):b.select({activeIdx:c,evt:d})}}}}]).directive("uibTypeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"uib/template/typeahead/typeahead-match.html";a(g).then(function(a){var c=angular.element(a.trim());e.replaceWith(c),b(c)(d)})}}}]).filter("uibTypeaheadHighlight",["$sce","$injector","$log",function(a,b,c){function d(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}function e(a){return/<.*>/g.test(a)}var f;return f=b.has("$sanitize"),function(b,g){return!f&&e(b)&&c.warn("Unsafe use of typeahead please use ngSanitize"),b=g?(""+b).replace(new RegExp(d(g),"gi"),"$&"):b,f||(b=a.trustAsHtml(b)),b}}]),angular.module("uib/template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("uib/template/accordion/accordion-group.html",'
    \n \n
    \n
    \n
    \n
    \n'); +}]),angular.module("uib/template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("uib/template/accordion/accordion.html",'
    ')}]),angular.module("uib/template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("uib/template/alert/alert.html",'\n')}]),angular.module("uib/template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("uib/template/carousel/carousel.html",'
    \n
    \n \n \n previous\n \n \n \n next\n \n
      \n
    1. \n slide {{ $index + 1 }} of {{ slides.length }}, currently active\n
      2. \n
    \n
    \n')}]),angular.module("uib/template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("uib/template/carousel/slide.html",'
    \n')}]),angular.module("uib/template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/datepicker.html",'
    \n \n \n \n
    \n')}]),angular.module("uib/template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/day.html",'\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
    {{::label.abbr}}
    {{ weekNumbers[$index] }}\n \n
    \n')}]),angular.module("uib/template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/month.html",'\n \n \n \n \n \n \n \n \n \n \n \n \n
    \n \n
    \n')}]),angular.module("uib/template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/popup.html",'
    \n
      \n
    • \n
    • \n \n \n \n \n \n
      • \n
    \n
    \n')}]),angular.module("uib/template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/year.html",'\n \n \n \n \n \n \n \n \n \n \n \n \n
    \n \n
    \n')}]),angular.module("uib/template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("uib/template/modal/backdrop.html",'
    \n')}]),angular.module("uib/template/modal/window.html",[]).run(["$templateCache",function(a){a.put("uib/template/modal/window.html",'\n')}]),angular.module("uib/template/pager/pager.html",[]).run(["$templateCache",function(a){a.put("uib/template/pager/pager.html",'\n')}]),angular.module("uib/template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("uib/template/pagination/pager.html",'\n')}]),angular.module("uib/template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("uib/template/pagination/pagination.html",'\n')}]),angular.module("uib/template/tooltip/tooltip-html-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-html-popup.html",'
    \n
    \n
    \n
    \n')}]),angular.module("uib/template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-popup.html",'
    \n
    \n
    \n
    \n')}]),angular.module("uib/template/tooltip/tooltip-template-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-template-popup.html",'
    \n
    \n
    \n
    \n')}]),angular.module("uib/template/popover/popover-html.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover-html.html",'
    \n
    \n\n
    \n

    \n
    \n
    \n
    \n')}]),angular.module("uib/template/popover/popover-template.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover-template.html",'
    \n
    \n\n
    \n

    \n
    \n
    \n
    \n')}]),angular.module("uib/template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover.html",'
    \n
    \n\n
    \n

    \n
    \n
    \n
    \n')}]),angular.module("uib/template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/bar.html",'
    \n')}]),angular.module("uib/template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/progress.html",'
    ')}]),angular.module("uib/template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/progressbar.html",'
    \n
    \n
    \n')}]),angular.module("uib/template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("uib/template/rating/rating.html",'\n ({{ $index < value ? \'*\' : \' \' }})\n \n\n')}]),angular.module("uib/template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("uib/template/tabs/tab.html",'
  • \n {{heading}}\n
    • \n')}]),angular.module("uib/template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("uib/template/tabs/tabset.html",'
    \n
      \n
      \n
      \n
      \n
      \n
      \n')}]),angular.module("uib/template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("uib/template/timepicker/timepicker.html",'\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
        
      \n \n :\n \n :\n \n
        
      \n')}]),angular.module("uib/template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("uib/template/typeahead/typeahead-match.html",'\n')}]),angular.module("uib/template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/typeahead/typeahead-popup.html",'
        \n
      • \n
        \n
        • \n
      \n')}]),angular.module("ui.bootstrap.carousel").run(function(){!angular.$$csp().noInlineStyle&&!angular.$$uibCarouselCss&&angular.element(document).find("head").prepend(''),angular.$$uibCarouselCss=!0}),angular.module("ui.bootstrap.position").run(function(){!angular.$$csp().noInlineStyle&&!angular.$$uibPositionCss&&angular.element(document).find("head").prepend(''),angular.$$uibPositionCss=!0}),angular.module("ui.bootstrap.datepicker").run(function(){!angular.$$csp().noInlineStyle&&!angular.$$uibDatepickerCss&&angular.element(document).find("head").prepend(''),angular.$$uibDatepickerCss=!0}),angular.module("ui.bootstrap.tooltip").run(function(){!angular.$$csp().noInlineStyle&&!angular.$$uibTooltipCss&&angular.element(document).find("head").prepend(''),angular.$$uibTooltipCss=!0}),angular.module("ui.bootstrap.timepicker").run(function(){!angular.$$csp().noInlineStyle&&!angular.$$uibTimepickerCss&&angular.element(document).find("head").prepend(''),angular.$$uibTimepickerCss=!0}),angular.module("ui.bootstrap.typeahead").run(function(){!angular.$$csp().noInlineStyle&&!angular.$$uibTypeaheadCss&&angular.element(document).find("head").prepend(''),angular.$$uibTypeaheadCss=!0}); \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/cloud_form.html b/ntt_tool/static/partials/cloud/cloud_form.html index 7eb7bcd..5c2a715 100644 --- a/ntt_tool/static/partials/cloud/cloud_form.html +++ b/ntt_tool/static/partials/cloud/cloud_form.html @@ -3,26 +3,36 @@
      -

      {$ event | capitalize:true $} Cloud

      +
        +
      1. Cloud List
        2. +
      2. Add Cloud
        3. +
      +
      +
      +
      +
      +
      +

      {$ event | capitalize:true $} Cloud

      +
      - +
      - +
      - +
      - +
      - +
      Cancel diff --git a/ntt_tool/static/partials/cloud/cloud_view.html b/ntt_tool/static/partials/cloud/cloud_view.html index a2aae89..59ab3f3 100644 --- a/ntt_tool/static/partials/cloud/cloud_view.html +++ b/ntt_tool/static/partials/cloud/cloud_view.html @@ -7,32 +7,38 @@
    • Cloud List
    • Cloud Details
      • - -
      -
      - Cloud Details - Edit -
      - - - - - - - - - - - - - -
      Name : {$ cloud.name $}Keystone Auth URL : {$ cloud.keystone_auth_url $}
      Keystone Tenant Name : {$ cloud.keystone_tenant_name $}Keystone User : {$ cloud.keystone_user $}
      +
      +
      +
      +

      Cloud Details

      + Edit
      + + + + + + + + + + + + + + + + + +
      Name : {$ cloud.name $}
      Keystone Auth URL : {$ cloud.keystone_auth_url $}
      Keystone Tenant Name : {$ cloud.keystone_tenant_name $}
      Keystone User : {$ cloud.keystone_user $}
      +
      +
      +
      -
      - +
      +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html b/ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html deleted file mode 100644 index 4fe94cf..0000000 --- a/ntt_tool/static/partials/cloud/tenants/cloud_tenants_discovery.html +++ /dev/null @@ -1,24 +0,0 @@ - - -
      -
      -
      -
        -
      1. Cloud List
        2. -
      2. Cloud Details
        3. -
      3. Tenant Discovery
        4. -
      -
      -
      - -
      -
      -
      -

      Tenant Discovery

      -
      -
      -
      -
      -
      -
      -
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html b/ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html deleted file mode 100644 index 27def3f..0000000 --- a/ntt_tool/static/partials/cloud/tenants/cloud_tenants_list.html +++ /dev/null @@ -1,20 +0,0 @@ -
      - - Discover Tenants - -

      Tenants

      -
      - - - - - - - - - - -
      NameActions
      {$ tenant.name $}-
      - - - diff --git a/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html b/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html new file mode 100644 index 0000000..c145f63 --- /dev/null +++ b/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html @@ -0,0 +1,55 @@ + + +
      +
      +
      +
        +
      1. Cloud List
        2. +
      2. Cloud Details
        3. +
      3. Tenant Discovery
        4. +
      +
      +
      + +
      +
      +
      +

      Tenant Discovery

      +
      +
      +
      +
      + +
      + + + + + + + + + +
      Total Tenants: 10Total Routers: 10
      Total Networks: 10Total VM: 10
      + + + + + + + + + + + + + + + + +
      Tenant NameRouter NameNetwork NameNetwork CIDR
      {$ item.name $}as{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}
      + +
      +
      +
      +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/tenants/tenants_list.html b/ntt_tool/static/partials/cloud/tenants/tenants_list.html new file mode 100644 index 0000000..1b2b5e4 --- /dev/null +++ b/ntt_tool/static/partials/cloud/tenants/tenants_list.html @@ -0,0 +1,23 @@ +
      + + Discover Tenants + +

      Tenants

      +
      + + + + + + + + + + + + + + +
      Tenant NameRouter NameNetwork NameNetwork CIDR
      {$ item.name $}as{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}
      + + diff --git a/ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html deleted file mode 100644 index 3a6980a..0000000 --- a/ntt_tool/static/partials/cloud/traffic/cloudtraffic_form.html +++ /dev/null @@ -1,63 +0,0 @@ - - -
      - -
      -
      -

      {$ event | capitalize:true $} Cloud Traffic

      -

      Cloud > Traffic

      - -
      - * - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - -
      - -
      -
      -
      - - -
      -
      - - -
      - Cancel - - -
      -
      -
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html b/ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html deleted file mode 100644 index f7fdd6f..0000000 --- a/ntt_tool/static/partials/cloud/traffic/cloudtraffic_list.html +++ /dev/null @@ -1,34 +0,0 @@ -
      - - Add Traffic - -

      Cloud Traffic

      -
      - - - - - - - - - - - - - - - - - - - - - - - - -
      NameAllowed Delta PercentageTest Result PathNumber Of WorkersRemote UserTest MethodIPERF DurationTypeActions
      {$ cloudTraffic.name $}{$ cloudTraffic.allowed_delta_percentage $}{$ cloudTraffic.test_result_path $}{$ cloudTraffic.number_of_workers $}{$ cloudTraffic.remote_user $}{$ cloudTraffic.test_method $}{$ cloudTraffic.iperf_duration $}{$ cloudTraffic.tenant_type $} - - -
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_form.html b/ntt_tool/static/partials/cloud/traffic/traffic_form.html new file mode 100644 index 0000000..6c05273 --- /dev/null +++ b/ntt_tool/static/partials/cloud/traffic/traffic_form.html @@ -0,0 +1,100 @@ + + +
      +
      +
      +
        +
      1. Cloud List
        2. +
      2. Cloud Details
        3. +
      3. Add Traffic
        4. +
      +
      +
      + +
      +
      +
      +

      {$ event | capitalize:true $} Traffic

      +
      +
      + +
      +
      +
      + * + +
      +
      +
      +
      + +
      + + % +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + +
      + + sec +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + +
      +
      + + + +
      +
      +
      +
      +
      + +
      +
      + + + + + +
      +
      +
      +
      + Cancel + +
      +
      +
      +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_list.html b/ntt_tool/static/partials/cloud/traffic/traffic_list.html new file mode 100644 index 0000000..fa58d59 --- /dev/null +++ b/ntt_tool/static/partials/cloud/traffic/traffic_list.html @@ -0,0 +1,34 @@ +
      + + Add Traffic + +

      Traffic

      +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      NameAllowed Delta PercentageTest Result PathNumber Of WorkersRemote UserTest MethodIPERF DurationTypeActions
      {$ cloudTraffic.name $}{$ cloudTraffic.allowed_delta_percentage $}{$ cloudTraffic.test_result_path $}{$ cloudTraffic.number_of_workers $}{$ cloudTraffic.remote_user $}{$ cloudTraffic.test_method $}{$ cloudTraffic.iperf_duration $}{$ cloudTraffic.tenant_type $} + + +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/common/header.html b/ntt_tool/static/partials/common/header.html index e6b24ea..094223a 100644 --- a/ntt_tool/static/partials/common/header.html +++ b/ntt_tool/static/partials/common/header.html @@ -2,10 +2,10 @@
      - -
      -
      +
      + +
      +
      *
      -
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      @@ -34,13 +47,7 @@

      {$ event | capitalize:true $} Traffic

      -
      -
      - - -
      -
      -
      +
      @@ -49,25 +56,20 @@

      {$ event | capitalize:true $} Traffic

      -
      +
      - - -
      -
      -
      -
      - - + +
      -
      + +
      - - + +
      -
      +

      @@ -78,23 +80,94 @@

      {$ event | capitalize:true $} Traffic

      -
      +
      - -
      -
      - - - - - + + +
      +
      + +
      +
      + + +
      +
      + +
      +
      + + +
      +
      +
      + + +
      +
      +
      +
      Available Tenants
      + + + + + + + + + + + + + + + +
      Tenant NameRouter NameNetwork NameNetwork CIDR
      {$ item.name $}as{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}
      +
      +
      No tenants available
      + +
      +
      +
      Selected Tenants
      + + + + + + + + + + + + + + + +
      Tenant NameRouter NameNetwork NameNetwork CIDR
      {$ item.name $}{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}
      +
      +
      No tenants selected
      +
      +
      +
      +
      + + +
      - Cancel + Cancel
      - -
      +
      + +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_list.html b/ntt_tool/static/partials/cloud/traffic/traffic_list.html index fa58d59..a998b04 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_list.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_list.html @@ -4,31 +4,31 @@

      Traffic

      - - + - + - + - +
      Name Allowed Delta Percentage Test Result PathNumber Of Workers# Workers Remote User Test Method IPERF Duration Type Actions
      {$ cloudTraffic.name $}{$ cloudTraffic.allowed_delta_percentage $}{$ cloudTraffic.allowed_delta_percentage $} % {$ cloudTraffic.test_result_path $} {$ cloudTraffic.number_of_workers $} {$ cloudTraffic.remote_user $} {$ cloudTraffic.test_method $}{$ cloudTraffic.iperf_duration $}{$ cloudTraffic.iperf_duration $} sec {$ cloudTraffic.tenant_type $} - - + + +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_test.html b/ntt_tool/static/partials/cloud/traffic/traffic_test.html new file mode 100644 index 0000000..4f07059 --- /dev/null +++ b/ntt_tool/static/partials/cloud/traffic/traffic_test.html @@ -0,0 +1,24 @@ + + +
      +
      +
      +
        +
      1. Cloud List
        2. +
      2. Cloud Details
        3. +
      3. Traffic Test
        4. +
      +
      +
      + +
      +
      +
      +

      Traffic Test

      +
      +
      +
      +
      +
      +
      +
      \ No newline at end of file From 5f67ab0d0ce6076f057d7bafff97ccd36275e0f2 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Tue, 15 Mar 2016 18:50:47 +0530 Subject: [PATCH 16/57] Added tenant discovery feature --- .idea/workspace.xml | 465 ++++++++++-------- .../apps/cloud/migrations/0001_initial.py | 55 ++- ..._tenants.py => 0002_auto_20160315_1219.py} | 7 +- ..._gateway.py => 0003_auto_20160315_1249.py} | 10 +- .../migrations/0004_auto_20160315_1307.py | 20 + ntt_tool/apps/cloud/models.py | 42 +- ntt_tool/apps/cloud/serializers.py | 54 +- .../apps/cloud/tenantdiscoverycontroller.py | 36 -- ntt_tool/apps/cloud/views.py | 69 +-- ntt_tool/static/css/custom.css | 10 +- .../js/apps/controllers/tenantcontroller.js | 37 +- .../js/apps/controllers/trafficcontroller.js | 43 +- .../static/js/apps/services/dataservice.js | 1 - .../static/js/apps/services/tenantservice.js | 4 + .../static/partials/cloud/cloud_view.html | 2 +- .../cloud/tenants/tenants_discovery.html | 74 ++- .../partials/cloud/tenants/tenants_list.html | 11 +- .../partials/cloud/traffic/traffic_form.html | 36 +- requirements.txt | 3 + 19 files changed, 554 insertions(+), 425 deletions(-) rename ntt_tool/apps/cloud/migrations/{0002_traffic_tenants.py => 0002_auto_20160315_1219.py} (63%) rename ntt_tool/apps/cloud/migrations/{0003_traffic_ssh_gateway.py => 0003_auto_20160315_1249.py} (52%) create mode 100644 ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py delete mode 100644 ntt_tool/apps/cloud/tenantdiscoverycontroller.py diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b54412b..0a25a37 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,21 +2,24 @@ - - + + + + - - - + + - - + + + + - + @@ -54,13 +57,13 @@ - + - - + + - + @@ -70,37 +73,27 @@ - + - - + + - - - - - - - - - - - + - - + + - - + + @@ -110,27 +103,27 @@ - + - - + + - - + + - - + + - - + + @@ -143,8 +136,8 @@ @@ -154,12 +147,6 @@ @@ -244,7 +237,6 @@ - @@ -596,8 +588,61 @@ + @@ -608,9 +653,6 @@ - - - @@ -618,6 +660,10 @@ + + + + @@ -886,47 +932,47 @@ - + - + + - + - - - + + - + + - - + - + - - + + @@ -958,62 +1004,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1042,13 +1032,6 @@ - - - - - - - @@ -1098,13 +1081,6 @@ - - - - - - - @@ -1117,7 +1093,6 @@ - @@ -1125,7 +1100,6 @@ - @@ -1133,14 +1107,6 @@ - - - - - - - - @@ -1148,7 +1114,6 @@ - @@ -1156,15 +1121,6 @@ - - - - - - - - - @@ -1172,7 +1128,6 @@ - @@ -1180,7 +1135,6 @@ - @@ -1192,138 +1146,189 @@ - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + - + - - + + - + - - + + - + - - + + @@ -1331,20 +1336,52 @@ - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.py b/ntt_tool/apps/cloud/migrations/0001_initial.py index 17455c4..581a170 100644 --- a/ntt_tool/apps/cloud/migrations/0001_initial.py +++ b/ntt_tool/apps/cloud/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-08 07:03 +# Generated by Django 1.9.2 on 2016-03-15 12:04 from __future__ import unicode_literals from django.conf import settings @@ -34,16 +34,47 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='Tenants', + name='Network', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('network_name', models.CharField(max_length=255)), + ('network_cidr', models.CharField(max_length=255)), + ('subnet', models.CharField(blank=True, max_length=255, null=True)), + ('status', models.CharField(max_length=25)), + ('created_on', models.DateTimeField(auto_now=True)), + ('updated_on', models.DateTimeField(auto_now_add=True)), + ('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'db_table': 'cloud_tenant_networks', + }, + ), + migrations.CreateModel( + name='Router', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('router_id', models.CharField(max_length=255)), + ('router_name', models.CharField(max_length=255)), + ('status', models.CharField(max_length=25)), + ('created_on', models.DateTimeField(auto_now=True)), + ('updated_on', models.DateTimeField(auto_now_add=True)), + ('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'db_table': 'cloud_tenant_routers', + }, + ), + migrations.CreateModel( + name='Tenant', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('tenant_id', models.CharField(max_length=100)), ('tenant_name', models.CharField(max_length=256)), - ('router_name', models.CharField(max_length=256)), - ('network_name', models.CharField(max_length=256)), - ('network_CIDR', models.CharField(max_length=256)), + ('description', models.CharField(max_length=256)), + ('enabled', models.BooleanField()), ('created_on', models.DateTimeField(auto_now=True)), ('updated_on', models.DateTimeField(auto_now_add=True)), - ('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cloud_tenants', to='cloud.Cloud')), + ('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tenants', to='cloud.Cloud')), ('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ @@ -64,13 +95,25 @@ class Migration(migrations.Migration): ('iperf_duration', models.IntegerField()), ('tenant_type', models.CharField(choices=[('all', 'All'), ('intra-tenant', 'Intra Tenant'), ('inter-tenant', 'Inter Tenant'), ('south-north', 'South to North'), ('north-south', 'North to South')], default='all', max_length=20)), ('external_host', models.CharField(blank=True, max_length=100, null=True)), + ('ssh_gateway', models.CharField(blank=True, max_length=100, null=True)), ('created_on', models.DateTimeField(auto_now=True)), ('updated_on', models.DateTimeField(auto_now_add=True)), ('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cloud_traffic', to='cloud.Cloud')), ('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('tenants', models.ManyToManyField(to='cloud.Tenant')), ], options={ 'db_table': 'cloud_traffic', }, ), + migrations.AddField( + model_name='router', + name='tenant', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='routers', to='cloud.Tenant'), + ), + migrations.AddField( + model_name='network', + name='tenant', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='networks', to='cloud.Tenant'), + ), ] diff --git a/ntt_tool/apps/cloud/migrations/0002_traffic_tenants.py b/ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py similarity index 63% rename from ntt_tool/apps/cloud/migrations/0002_traffic_tenants.py rename to ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py index a009541..92d7340 100644 --- a/ntt_tool/apps/cloud/migrations/0002_traffic_tenants.py +++ b/ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-09 07:06 +# Generated by Django 1.9.2 on 2016-03-15 12:19 from __future__ import unicode_literals from django.db import migrations, models @@ -12,10 +12,9 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AddField( + migrations.AlterField( model_name='traffic', name='tenants', - field=models.CharField(default='', max_length=250), - preserve_default=False, + field=models.ManyToManyField(related_name='tenants', to='cloud.Tenant'), ), ] diff --git a/ntt_tool/apps/cloud/migrations/0003_traffic_ssh_gateway.py b/ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py similarity index 52% rename from ntt_tool/apps/cloud/migrations/0003_traffic_ssh_gateway.py rename to ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py index 8cee6df..56114cb 100644 --- a/ntt_tool/apps/cloud/migrations/0003_traffic_ssh_gateway.py +++ b/ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-10 07:51 +# Generated by Django 1.9.2 on 2016-03-15 12:49 from __future__ import unicode_literals from django.db import migrations, models @@ -8,13 +8,13 @@ class Migration(migrations.Migration): dependencies = [ - ('cloud', '0002_traffic_tenants'), + ('cloud', '0002_auto_20160315_1219'), ] operations = [ - migrations.AddField( + migrations.AlterField( model_name='traffic', - name='ssh_gateway', - field=models.CharField(blank=True, max_length=100, null=True), + name='tenants', + field=models.ManyToManyField(to='cloud.Tenant'), ), ] diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py b/ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py new file mode 100644 index 0000000..5bbe0e5 --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-15 13:07 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cloud', '0003_auto_20160315_1249'), + ] + + operations = [ + migrations.AlterField( + model_name='traffic', + name='tenants', + field=models.ManyToManyField(blank=True, null=True, to='cloud.Tenant'), + ), + ] diff --git a/ntt_tool/apps/cloud/models.py b/ntt_tool/apps/cloud/models.py index 1ced66f..c872562 100644 --- a/ntt_tool/apps/cloud/models.py +++ b/ntt_tool/apps/cloud/models.py @@ -17,12 +17,12 @@ class Meta: db_table = "cloud_details" -class Tenants(models.Model): - cloud = models.ForeignKey(Cloud, blank=True, null=True, related_name="cloud_tenants") +class Tenant(models.Model): + cloud = models.ForeignKey(Cloud, blank=True, null=True, related_name="tenants") + tenant_id = models.CharField(max_length=100) tenant_name = models.CharField(max_length=256) - router_name = models.CharField(max_length=256) - network_name = models.CharField(max_length=256) - network_CIDR = models.CharField(max_length=256) + description = models.CharField(max_length=256) + enabled = models.BooleanField() creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -31,6 +31,33 @@ class Meta: db_table = "cloud_tenants" +class Network(models.Model): + tenant = models.ForeignKey(Tenant, related_name="networks") + network_name = models.CharField(max_length=255) + network_cidr = models.CharField(max_length=255) + subnet = models.CharField(max_length=255, blank=True, null=True) + status = models.CharField(max_length=25) + creator = models.ForeignKey(User, blank=True, null=True) + created_on = models.DateTimeField(auto_now=True) + updated_on = models.DateTimeField(auto_now_add=True) + + class Meta: + db_table = "cloud_tenant_networks" + + +class Router(models.Model): + tenant = models.ForeignKey(Tenant, related_name="routers") + router_id = models.CharField(max_length=255) + router_name = models.CharField(max_length=255) + status = models.CharField(max_length=25) + creator = models.ForeignKey(User, blank=True, null=True) + created_on = models.DateTimeField(auto_now=True) + updated_on = models.DateTimeField(auto_now_add=True) + + class Meta: + db_table = "cloud_tenant_routers" + + class Traffic(models.Model): TYPE_CHOICES = ( ('all', 'All'), @@ -50,7 +77,7 @@ class Traffic(models.Model): test_method = models.CharField(max_length=100) iperf_duration = models.IntegerField() tenant_type = models.CharField(max_length=20, choices=TYPE_CHOICES, default='all') - tenants = models.CharField(max_length=250) + tenants = models.ManyToManyField(Tenant, blank=True, null=True) external_host = models.CharField(max_length=100, blank=True, null=True) ssh_gateway = models.CharField(max_length=100, blank=True, null=True) creator = models.ForeignKey(User, blank=True, null=True) @@ -61,3 +88,6 @@ class Meta: db_table = "cloud_traffic" +# class TrafficTenant(models.Model): +# traffic = models.ForeignKey(Traffic) +# tenant = models.ForeignKey(Tenant) \ No newline at end of file diff --git a/ntt_tool/apps/cloud/serializers.py b/ntt_tool/apps/cloud/serializers.py index 126fff6..0edbc74 100644 --- a/ntt_tool/apps/cloud/serializers.py +++ b/ntt_tool/apps/cloud/serializers.py @@ -9,11 +9,33 @@ class Meta: exclude = ('creator', 'updated_on') +class NetworkSerializer(serializers.ModelSerializer): + + class Meta: + model = Network + exclude = ('creator', 'created_on', 'updated_on',) + + +class RouterSerializer(serializers.ModelSerializer): + + class Meta: + model = Router + exclude = ('creator', 'created_on', 'updated_on',) + + class TenantSerializer(serializers.ModelSerializer): + networks = NetworkSerializer(many=True, read_only=True) + routers = RouterSerializer(many=True, read_only=True) class Meta: - model = Tenants - exclude = ('remote_pass', 'external_host', 'tenants', 'creator', 'created_on', 'updated_on',) + model = Tenant + exclude = ('creator', 'created_on', 'updated_on',) + + +# class TrafficTenantSerializer(serializers.ModelSerializer): +# +# class Meta: +# model = TrafficTenants class TrafficListSerializer(serializers.ModelSerializer): @@ -24,33 +46,19 @@ class Meta: class TrafficRetrieveSerializer(serializers.ModelSerializer): - available_tenants = serializers.SerializerMethodField() - selected_tenants = serializers.SerializerMethodField() - - def get_available_tenants(self, obj): - available = [ - {"id": 1, "name": "tenant-test-101", "router_name": "tenant-test-101-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 2, "name": "tenant-test-102", "router_name": "tenant-test-102-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 3, "name": "tenant-test-103", "router_name": "tenant-test-103-router", "network_name": "tenant-test-101-net-1", "network_cidr": "2.2.2.0/24"}, - ] - return [x for x in available if str(x.get("id")) not in obj.tenants.split(",")] - - def get_selected_tenants(self, obj): - selected = [ - {"id": 1, "name": "tenant-test-101", "router_name": "tenant-test-101-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 2, "name": "tenant-test-102", "router_name": "tenant-test-102-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 3, "name": "tenant-test-103", "router_name": "tenant-test-103-router", "network_name": "tenant-test-101-net-1", "network_cidr": "2.2.2.0/24"}, - ] - return [x for x in selected if str(x.get("id")) in obj.tenants.split(",")] + tenants = TenantSerializer(many=True) class Meta: model = Traffic - exclude = ('creator', 'created_on', 'updated_on',) + fields = ('id', 'cloud', 'name', 'allowed_delta_percentage', 'test_result_path', + 'number_of_workers', 'remote_user', 'remote_pass', 'test_method', + 'iperf_duration', 'tenant_type', 'tenants', 'external_host', 'ssh_gateway',) class TrafficSerializer(serializers.ModelSerializer): class Meta: model = Traffic - exclude = ('creator', 'created_on', 'updated_on',) - + fields = ('id', 'cloud', 'name', 'allowed_delta_percentage', 'test_result_path', + 'number_of_workers', 'remote_user', 'remote_pass', 'test_method', + 'iperf_duration', 'tenant_type', 'tenants', 'external_host', 'ssh_gateway',) diff --git a/ntt_tool/apps/cloud/tenantdiscoverycontroller.py b/ntt_tool/apps/cloud/tenantdiscoverycontroller.py deleted file mode 100644 index 9871c45..0000000 --- a/ntt_tool/apps/cloud/tenantdiscoverycontroller.py +++ /dev/null @@ -1,36 +0,0 @@ -import ConfigParser -from models import Cloud - - -class TenantDiscoveryController(object): - - def generate_config(self, cloud_id): - """ - Function to generate config.ini file which is used as a input to - tenant discovery script - :return: True if success else False - """ - config = ConfigParser.ConfigParser() - try: - cloud = Cloud.objects.get(pk=cloud_id) - config.set(ConfigParser.DEFAULTSECT, "keystone_auth_url", cloud.keystone_auth_url) - config.set(ConfigParser.DEFAULTSECT, "keystone_user", cloud.keystone_user) - config.set(ConfigParser.DEFAULTSECT, "keystone_password", cloud.keystone_password) - config.set(ConfigParser.DEFAULTSECT, "keystone_tenant_name", cloud.keystone_tenant_name) - except Cloud.DoesNotExist: - return False - - with open('config.ini', 'wb') as f: - config.write(f) - - return True - - def discover_tenants(self, cloud_id): - self.generate_config(cloud_id) - return [] - - - - - - diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index be22028..303e28b 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -1,3 +1,4 @@ +from rest_framework import status from rest_framework import viewsets from rest_framework.decorators import list_route, detail_route from rest_framework.permissions import IsAuthenticated @@ -5,6 +6,7 @@ from rest_framework_jwt.authentication import JSONWebTokenAuthentication from models import * from serializers import * +from scripts.tenantnetworkdiscovery import TenantDiscovery, NetworkRouterDiscovery class CloudViewSet(viewsets.ModelViewSet): @@ -18,7 +20,7 @@ def perform_create(self, serializer): class TenantViewSet(viewsets.ModelViewSet): - queryset = Tenants.objects.all() + queryset = Tenant.objects.all() serializer_class = TenantSerializer authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) @@ -26,7 +28,7 @@ class TenantViewSet(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): cloud_id = self.request.GET.get("cloud_id") queryset = self.filter_queryset( - Tenants.objects.filter(cloud_id=cloud_id)) + Tenant.objects.filter(cloud_id=cloud_id)) page = self.paginate_queryset(queryset) if page is not None: @@ -38,33 +40,29 @@ def list(self, request, *args, **kwargs): @list_route(methods=["get"], url_path="discover/(?P[^/.]+)") def discover(self, request, cloud_id=None): - response = { - "total_tenants": 10, - "total_routers": 10, - "total_networks": 10, - "total_vm": 10, - "tenants": [ - {"id": 1, - "name": "tenant-test-101", - "router_name": "tenant-test-101-router", - "network_name": "tenant-test-101-net-1", - "network_cidr": "1.1.1.0/24"}, - {"id": 2, - "name": "tenant-test-102", - "router_name": "tenant-test-102-router", - "network_name": "tenant-test-101-net-1", - "network_cidr": "1.1.1.0/24"}, - {"id": 3, - "name": "tenant-test-103", - "router_name": "tenant-test-103-router", - "network_name": "tenant-test-101-net-1", - "network_cidr": "2.2.2.0/24"}, - ] + cloud = None + try: + cloud = Cloud.objects.get(pk=cloud_id, creator=request.user) + except Cloud.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + + credentials = { + "username": cloud.keystone_user, + "password": cloud.keystone_password, + "auth_url": cloud.keystone_auth_url, + "tenant_name": cloud.keystone_tenant_name } - import time - time.sleep(1) - return Response(response) + tenant_discovery = TenantDiscovery(**credentials) + tenants = tenant_discovery.get_tenants() + + network_router_discovery = NetworkRouterDiscovery(**credentials) + tenant_networks_routers = network_router_discovery.get_networks_and_routers( + request.user, + cloud_id, + tenants + ) + return Response(tenant_networks_routers) class TrafficViewSet(viewsets.ModelViewSet): @@ -73,7 +71,7 @@ class TrafficViewSet(viewsets.ModelViewSet): authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) action_serializers = { - 'retrieve': TrafficRetrieveSerializer, + 'retrieve': TrafficSerializer, 'list': TrafficListSerializer, 'create': TrafficSerializer, 'update': TrafficSerializer, @@ -101,9 +99,22 @@ def list(self, request, *args, **kwargs): def parse_tenants(self): return ",".join([str(x) for x in self.request.data.get("tenants", [])]) + def create(self, request, *args, **kwargs): + import pdb + pdb.set_trace() + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + self.perform_create(serializer) + headers = self.get_success_headers(serializer.data) + return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) + def perform_create(self, serializer): + + import pdb + pdb.set_trace() + serializer.save( - tenants=self.parse_tenants(), + # tenants=self.parse_tenants(), creator=self.request.user, cloud_id=self.request.data.get("cloud_id") ) diff --git a/ntt_tool/static/css/custom.css b/ntt_tool/static/css/custom.css index 68700b1..f459e94 100644 --- a/ntt_tool/static/css/custom.css +++ b/ntt_tool/static/css/custom.css @@ -106,7 +106,9 @@ td > a{ background: #fff; } - +.border { + border: 1px solid #ddd; +} /* widgets */ .card { @@ -136,4 +138,10 @@ td > a{ .breadcrumb { padding: 0; margin: 0; +} + +.list-group-item-heading-custom { + border-bottom: 1px solid #ddd; + margin-bottom: 15px; + padding-bottom: 10px; } \ No newline at end of file diff --git a/ntt_tool/static/js/apps/controllers/tenantcontroller.js b/ntt_tool/static/js/apps/controllers/tenantcontroller.js index b341cf3..0168e40 100644 --- a/ntt_tool/static/js/apps/controllers/tenantcontroller.js +++ b/ntt_tool/static/js/apps/controllers/tenantcontroller.js @@ -1,10 +1,9 @@ -nttApp.controller('TenantListCtrl', function($scope, tenantService){ - $scope.tenants = [ - {"id": 1, "name": "tenant-test-101", "router_name": "tenant-test-101-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 2, "name": "tenant-test-102", "router_name": "tenant-test-102-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 3, "name": "tenant-test-103", "router_name": "tenant-test-103-router", "network_name": "tenant-test-101-net-1", "network_cidr": "2.2.2.0/24"}, - ] - +nttApp.controller('TenantListCtrl', function($scope, $routeParams, tenantService){ + $scope.cloudId = $routeParams.id; + $scope.tenants = []; + tenantService.list($scope.cloudId).then(function(response){ + $scope.tenants = response; + }); }); nttApp.controller('TenantDiscoveryCtrl', function($scope, $routeParams, tenantService){ @@ -13,30 +12,10 @@ nttApp.controller('TenantDiscoveryCtrl', function($scope, $routeParams, tenantSe $scope.showLoading = true; $scope.discover = function(){ - tenantService.discover($scope.cloudId).then(function(data){ + tenantService.discover($scope.cloudId).then(function(response){ $scope.showLoading = false; - $scope.discoveryResult = { - "total_tenants": 10, - "total_routers": 10, - "total_networks": 10, - "total_vm": 10, - "tenants": [ - {"id": 1, "name": "tenant-test-101", "router_name": "tenant-test-101-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 2, "name": "tenant-test-102", "router_name": "tenant-test-102-router", "network_name": "tenant-test-101-net-1", "network_cidr": "1.1.1.0/24"}, - {"id": 3, "name": "tenant-test-103", "router_name": "tenant-test-103-router", "network_name": "tenant-test-101-net-1", "network_cidr": "2.2.2.0/24"}, - ] - }; + $scope.discoveryResult = response; }); }; $scope.discover(); - - $scope.selectedResult = { - "cloud_id": $scope.cloudId, - "tenants": [], - }; - $scope.saveTenants = function () { - tenantService.save($scope.selectedResult).then(function(data){ - console.log("Hey") - }); - }; }); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/controllers/trafficcontroller.js b/ntt_tool/static/js/apps/controllers/trafficcontroller.js index 2516ffb..02e0040 100644 --- a/ntt_tool/static/js/apps/controllers/trafficcontroller.js +++ b/ntt_tool/static/js/apps/controllers/trafficcontroller.js @@ -14,44 +14,61 @@ nttApp.controller('TrafficListCtrl', function($scope, $routeParams, trafficServi }); -nttApp.controller('TrafficCtrl', function($scope, $routeParams, $location, trafficService){ +nttApp.controller('TrafficCtrl', function($scope, $routeParams, $location, trafficService, tenantService){ $scope.cloudId = $routeParams.cloudId; $scope.id = $routeParams.id; $scope.event = $scope.id == undefined ? "add" : "edit"; $scope.cloudTraffic = { "cloud_id": $scope.cloudId, "tenant_type": "all", - "test_method": "icmp" + "test_method": "icmp", + "tenants": [] }; if ($scope.event == "edit"){ trafficService.get($scope.id).then(function(response){ - $scope.cloudTraffic = response; + $scope.cloudTraffic = response; + $scope.getTenants(); }); } + $scope.tenants = []; + $scope.getTenants = function(){ + tenantService.list($scope.cloudId).then(function(response){ + $scope.tenants = response; + }); + }; + if($scope.event == 'add'){ + $scope.getTenants(); + } + $scope.selectTenant = function($index){ - var selectedTenant = angular.copy($scope.cloudTraffic.available_tenants[$index]); - $scope.cloudTraffic.available_tenants.splice($index, 1); - $scope.cloudTraffic.selected_tenants.push(selectedTenant); + var selectedTenant = angular.copy($scope.tenants[$index]); + $scope.tenants.splice($index, 1); + $scope.cloudTraffic.tenants.push(selectedTenant); }; + $scope.unSelectTenant = function($index){ - var unselectedTenant = angular.copy($scope.cloudTraffic.selected_tenants[$index]); - $scope.cloudTraffic.selected_tenants.splice($index, 1); - $scope.cloudTraffic.available_tenants.push(unselectedTenant); + var unselectedTenant = angular.copy($scope.cloudTraffic.tenants[$index]); + $scope.cloudTraffic.tenants.splice($index, 1); + $scope.tenants.push(unselectedTenant); }; + $scope.getSelectedTenants = function(){ var selectedList = []; - angular.forEach($scope.cloudTraffic.selected_tenants, function(item, index){ + angular.forEach($scope.cloudTraffic.tenants, function(item, index){ selectedList.push(item.id); }); - return selectedList; + return JSON.stringify(selectedList); }; $scope.save = function(){ - $scope.cloudTraffic["tenants"] = $scope.getSelectedTenants(); + + var cloudTraffic = angular.copy($scope.cloudTraffic); + cloudTraffic["tenants"] = $scope.getSelectedTenants(); + console.log(cloudTraffic) if($scope.event == "add") { - trafficService.create($scope.cloudTraffic).then(function (response) { + trafficService.create(cloudTraffic).then(function (response) { $location.path("cloud/view/" + $scope.cloudId + "/"); }); } diff --git a/ntt_tool/static/js/apps/services/dataservice.js b/ntt_tool/static/js/apps/services/dataservice.js index 38ac192..d67ab08 100644 --- a/ntt_tool/static/js/apps/services/dataservice.js +++ b/ntt_tool/static/js/apps/services/dataservice.js @@ -14,7 +14,6 @@ nttApp.service('dataService', ['$http', '$q', function ($http, $q) { }; this.post = function (url, params) { - console.log($.param(params)) var deferred = $q.defer(); var request = $http({ method: "post", diff --git a/ntt_tool/static/js/apps/services/tenantservice.js b/ntt_tool/static/js/apps/services/tenantservice.js index 92ba0ad..8727683 100644 --- a/ntt_tool/static/js/apps/services/tenantservice.js +++ b/ntt_tool/static/js/apps/services/tenantservice.js @@ -3,6 +3,10 @@ nttApp.service('tenantService', function (dataService) { return dataService.get('/api/tenant/discover/' + cloudId + '/'); }; + this.list = function(cloudId){ + return dataService.get('/api/tenant/?cloud_id='+cloudId); + }; + this.save = function(params){ return dataService.post('/api/tenant/', params); }; diff --git a/ntt_tool/static/partials/cloud/cloud_view.html b/ntt_tool/static/partials/cloud/cloud_view.html index 59ab3f3..b97acce 100644 --- a/ntt_tool/static/partials/cloud/cloud_view.html +++ b/ntt_tool/static/partials/cloud/cloud_view.html @@ -13,7 +13,7 @@

      Cloud Details

      Edit
      - +
      diff --git a/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html b/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html index c145f63..3afd710 100644 --- a/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html +++ b/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html @@ -21,35 +21,55 @@

      Tenant Discovery

      -
      Name : {$ cloud.name $}
      - - - - - - - - -
      Total Tenants: 10Total Routers: 10
      Total Networks: 10Total VM: 10
      - - - - - - - - - - - - - - - -
      Tenant NameRouter NameNetwork NameNetwork CIDR
      {$ item.name $}as{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}
      - +
      +
      + {$ tenant.tenant_name $} + Enabled: {$ tenant.enabled $} +
      +
      +
      +
      +
      Networks
      + + + + + + + + + + + +
      NameNetwork CIDRStatus
      {$ network.network_name || '-' $}{$ network.network_cidr || '-' $}{$ network.status || '-' $}
      +
      +
      No networks found.
      +
      +
      +
      +
      Routers
      + + + + + + + + + +
      NameStatus
      {$ router.router_name || '-' $}{$ router.status || '-' $}
      +
      +
      No routers found.
      +
      +
      + +
      + + Back to Cloud +
      +
      \ No newline at end of file diff --git a/ntt_tool/static/partials/cloud/tenants/tenants_list.html b/ntt_tool/static/partials/cloud/tenants/tenants_list.html index 1b2b5e4..937a617 100644 --- a/ntt_tool/static/partials/cloud/tenants/tenants_list.html +++ b/ntt_tool/static/partials/cloud/tenants/tenants_list.html @@ -4,19 +4,14 @@

      Tenants

      - - - - + - - - - + +
      Tenant NameRouter NameNetwork NameNetwork CIDREnabled
      {$ item.name $}as{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}{$ item.tenant_name $}{$ item.enabled $}
      diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_form.html b/ntt_tool/static/partials/cloud/traffic/traffic_form.html index 7587d23..7abe2b6 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_form.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_form.html @@ -113,23 +113,19 @@

      {$ event | capitalize:true $} Traffic

      Available Tenants
      - +
      - - - - + + - - - - - + + +
      Tenant NameRouter NameNetwork NameNetwork CIDREnabled
      {$ item.name $}as{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}
      {$ tenant.tenant_name $}{$ tenant.enabled $}
      -
      +
      No tenants available
      @@ -138,23 +134,19 @@

      {$ event | capitalize:true $} Traffic

      Selected Tenants
      - +
      - + - - - + - + - - - - + +
      Tenant NameRouter NameNetwork NameNetwork CIDREnabled
      {$ item.name $}{$ item.router_name $}{$ item.network_name $}{$ item.network_cidr $}{$ tenant.tenant_name $}{$ tenant.enabled $}
      -
      +
      No tenants selected
      diff --git a/requirements.txt b/requirements.txt index 642f6ad..26906c3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,6 @@ djangorestframework==3.3.2 djangorestframework-jwt==1.7.2 six==1.10.0 wsgiref==0.1.2 + +python-keystoneclient==1.6.0 +python-neutronclient==2.6.0 From aadfb216eb5f0374d921beb63b357641d142a0ea Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Wed, 16 Mar 2016 14:50:02 +0530 Subject: [PATCH 17/57] Completed integration of tenant discovery script --- .idea/workspace.xml | 146 +++++++++--------- .../apps/cloud/migrations/0001_initial.py | 6 +- .../migrations/0002_auto_20160315_1219.py | 20 --- .../migrations/0003_auto_20160315_1249.py | 20 --- .../migrations/0004_auto_20160315_1307.py | 20 --- ntt_tool/apps/cloud/models.py | 6 +- ntt_tool/apps/cloud/scripts/__init__.py | 0 .../apps/cloud/scripts/keystoneclientutils.py | 6 + .../apps/cloud/scripts/neutronclientutils.py | 6 + .../cloud/scripts/openstackclientutils.py | 29 ++++ .../cloud/scripts/tenantnetworkdiscovery.py | 67 ++++++++ ntt_tool/apps/cloud/serializers.py | 47 +++--- ntt_tool/apps/cloud/views.py | 35 ++--- .../js/apps/controllers/trafficcontroller.js | 29 +++- 14 files changed, 245 insertions(+), 192 deletions(-) delete mode 100644 ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py delete mode 100644 ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py delete mode 100644 ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py create mode 100644 ntt_tool/apps/cloud/scripts/__init__.py create mode 100644 ntt_tool/apps/cloud/scripts/keystoneclientutils.py create mode 100644 ntt_tool/apps/cloud/scripts/neutronclientutils.py create mode 100644 ntt_tool/apps/cloud/scripts/openstackclientutils.py create mode 100644 ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0a25a37..8bf6aa1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,23 +3,14 @@ - - - + + + - - - - - - - - - @@ -57,24 +48,24 @@ - - + + - - - - + + - - + + - - - + + + + + @@ -83,17 +74,17 @@ - + - + - - + + @@ -119,11 +110,11 @@ - + - - + + @@ -192,12 +183,12 @@ @@ -208,9 +199,9 @@ @@ -932,7 +923,7 @@ - + @@ -940,7 +931,7 @@ - + @@ -970,9 +961,9 @@ - - + + @@ -1004,6 +995,14 @@ + + + + + + + + @@ -1205,14 +1204,6 @@ - - - - - - - - @@ -1225,7 +1216,6 @@ - @@ -1233,7 +1223,6 @@ - @@ -1241,7 +1230,6 @@ - @@ -1249,7 +1237,6 @@ - @@ -1257,7 +1244,6 @@ - @@ -1273,7 +1259,6 @@ - @@ -1305,80 +1290,87 @@ - - + - - + + - + - + - - + + - + - + - + - - - - + + - + - + - + - + - + + + + + + + + + + + - + - + - - + + diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.py b/ntt_tool/apps/cloud/migrations/0001_initial.py index 581a170..dd606f2 100644 --- a/ntt_tool/apps/cloud/migrations/0001_initial.py +++ b/ntt_tool/apps/cloud/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-15 12:04 +# Generated by Django 1.9.2 on 2016-03-16 07:39 from __future__ import unicode_literals from django.conf import settings @@ -70,8 +70,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('tenant_id', models.CharField(max_length=100)), ('tenant_name', models.CharField(max_length=256)), - ('description', models.CharField(max_length=256)), - ('enabled', models.BooleanField()), + ('description', models.CharField(blank=True, max_length=256, null=True)), + ('enabled', models.BooleanField(default=False)), ('created_on', models.DateTimeField(auto_now=True)), ('updated_on', models.DateTimeField(auto_now_add=True)), ('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tenants', to='cloud.Cloud')), diff --git a/ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py b/ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py deleted file mode 100644 index 92d7340..0000000 --- a/ntt_tool/apps/cloud/migrations/0002_auto_20160315_1219.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-15 12:19 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cloud', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='traffic', - name='tenants', - field=models.ManyToManyField(related_name='tenants', to='cloud.Tenant'), - ), - ] diff --git a/ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py b/ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py deleted file mode 100644 index 56114cb..0000000 --- a/ntt_tool/apps/cloud/migrations/0003_auto_20160315_1249.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-15 12:49 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cloud', '0002_auto_20160315_1219'), - ] - - operations = [ - migrations.AlterField( - model_name='traffic', - name='tenants', - field=models.ManyToManyField(to='cloud.Tenant'), - ), - ] diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py b/ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py deleted file mode 100644 index 5bbe0e5..0000000 --- a/ntt_tool/apps/cloud/migrations/0004_auto_20160315_1307.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-15 13:07 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cloud', '0003_auto_20160315_1249'), - ] - - operations = [ - migrations.AlterField( - model_name='traffic', - name='tenants', - field=models.ManyToManyField(blank=True, null=True, to='cloud.Tenant'), - ), - ] diff --git a/ntt_tool/apps/cloud/models.py b/ntt_tool/apps/cloud/models.py index c872562..ef5cae8 100644 --- a/ntt_tool/apps/cloud/models.py +++ b/ntt_tool/apps/cloud/models.py @@ -21,8 +21,8 @@ class Tenant(models.Model): cloud = models.ForeignKey(Cloud, blank=True, null=True, related_name="tenants") tenant_id = models.CharField(max_length=100) tenant_name = models.CharField(max_length=256) - description = models.CharField(max_length=256) - enabled = models.BooleanField() + description = models.CharField(max_length=256, blank=True, null=True) + enabled = models.BooleanField(default=False) creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -77,7 +77,7 @@ class Traffic(models.Model): test_method = models.CharField(max_length=100) iperf_duration = models.IntegerField() tenant_type = models.CharField(max_length=20, choices=TYPE_CHOICES, default='all') - tenants = models.ManyToManyField(Tenant, blank=True, null=True) + tenants = models.ManyToManyField(Tenant) external_host = models.CharField(max_length=100, blank=True, null=True) ssh_gateway = models.CharField(max_length=100, blank=True, null=True) creator = models.ForeignKey(User, blank=True, null=True) diff --git a/ntt_tool/apps/cloud/scripts/__init__.py b/ntt_tool/apps/cloud/scripts/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ntt_tool/apps/cloud/scripts/keystoneclientutils.py b/ntt_tool/apps/cloud/scripts/keystoneclientutils.py new file mode 100644 index 0000000..0a28745 --- /dev/null +++ b/ntt_tool/apps/cloud/scripts/keystoneclientutils.py @@ -0,0 +1,6 @@ +from keystoneclient.v2_0 import client as keystone_client +from openstackclientutils import OpenStackClientUtils + + +class KeystoneClientUtils(OpenStackClientUtils): + client_class = keystone_client.Client diff --git a/ntt_tool/apps/cloud/scripts/neutronclientutils.py b/ntt_tool/apps/cloud/scripts/neutronclientutils.py new file mode 100644 index 0000000..a446a76 --- /dev/null +++ b/ntt_tool/apps/cloud/scripts/neutronclientutils.py @@ -0,0 +1,6 @@ +from neutronclient.v2_0 import client as neutron_client +from openstackclientutils import OpenStackClientUtils + + +class NeutronClientUtils(OpenStackClientUtils): + client_class = neutron_client.Client diff --git a/ntt_tool/apps/cloud/scripts/openstackclientutils.py b/ntt_tool/apps/cloud/scripts/openstackclientutils.py new file mode 100644 index 0000000..765e5ba --- /dev/null +++ b/ntt_tool/apps/cloud/scripts/openstackclientutils.py @@ -0,0 +1,29 @@ +class OpenStackClientUtils(object): + + def __init__(self, username, password, auth_url, tenant_name=None): + self.username = username + self.password = password + self.auth_url = auth_url + self.tenant_name = tenant_name + + def get_credentials(self): + return { + "username": self.username, + "password": self.password, + "auth_url": self.auth_url, + "tenant_name": self.tenant_name + } + + def get_client_instance(self): + credentials = self.get_credentials() + return self.client_class(**credentials) + + + + + + + + + + diff --git a/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py b/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py new file mode 100644 index 0000000..b910e17 --- /dev/null +++ b/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py @@ -0,0 +1,67 @@ +from django.db import transaction +from keystoneclientutils import KeystoneClientUtils +from neutronclientutils import NeutronClientUtils +from ntt_tool.apps.cloud.models import Tenant, Network, Router +from ntt_tool.apps.cloud.serializers import TenantSerializer + + +class TenantDiscovery(KeystoneClientUtils): + + def get_tenants(self): + keystone = self.get_client_instance() + return keystone.tenants.list() + + +class NetworkRouterDiscovery(NeutronClientUtils): + + def get_networks_and_routers(self, user, cloud_id, tenants): + neutron = self.get_client_instance() + + discovery_result = [] + + with transaction.atomic(): + Tenant.objects.filter(cloud_id=cloud_id).delete() + + for tenant in tenants: + tenant_obj = Tenant() + tenant_obj.cloud_id = cloud_id + tenant_obj.tenant_id = tenant.id + tenant_obj.tenant_name = tenant.name + tenant_obj.description = tenant.description + tenant_obj.enabled = tenant.enabled + tenant_obj.creator = user + tenant_obj.save() + + # ToDo: Need to update status, vlan, network_cidr + networks_list = [] + networks = neutron.list_networks(tenant_id=tenant.id) + for network in networks.get("networks", []): + network_obj = Network() + network_obj.tenant = tenant_obj + network_obj.network_name = network.get("name") + # ToDo: We are assuming that each network is having only one subnet + # ToDo: Need to handle the scenario if we add more than one subnet for a network + if network.get("subnets"): + subnet_list = neutron.list_subnets(id=network.get("subnets")) + network_obj.network_cidr = subnet_list.get("subnets")[0].get("cidr") + network_obj.status = network.get("status") + network_obj.creator = user + networks_list.append(network_obj) + Network.objects.bulk_create(networks_list) + + # ToDo: Need to update status + routers_list = [] + routers = neutron.list_routers(tenant_id=tenant.id) + for router in routers.get("routers", []): + router_obj = Router() + router_obj.tenant = tenant_obj + router_obj.router_id = router.get("id") + router_obj.router_name = router.get("name") + router_obj.status = router.get("status") + router_obj.creator = user + routers_list.append(router_obj) + Router.objects.bulk_create(routers_list) + + serializer = TenantSerializer(tenant_obj) + discovery_result.append(serializer.data) + return discovery_result diff --git a/ntt_tool/apps/cloud/serializers.py b/ntt_tool/apps/cloud/serializers.py index 0edbc74..d747d97 100644 --- a/ntt_tool/apps/cloud/serializers.py +++ b/ntt_tool/apps/cloud/serializers.py @@ -23,6 +23,12 @@ class Meta: exclude = ('creator', 'created_on', 'updated_on',) +class TenantListSerializer(serializers.ModelSerializer): + class Meta: + model = Tenant + fields = ('id', 'tenant_name', 'enabled', 'description') + + class TenantSerializer(serializers.ModelSerializer): networks = NetworkSerializer(many=True, read_only=True) routers = RouterSerializer(many=True, read_only=True) @@ -32,12 +38,6 @@ class Meta: exclude = ('creator', 'created_on', 'updated_on',) -# class TrafficTenantSerializer(serializers.ModelSerializer): -# -# class Meta: -# model = TrafficTenants - - class TrafficListSerializer(serializers.ModelSerializer): class Meta: @@ -45,20 +45,29 @@ class Meta: exclude = ('creator', 'updated_on',) -class TrafficRetrieveSerializer(serializers.ModelSerializer): - tenants = TenantSerializer(many=True) - - class Meta: - model = Traffic - fields = ('id', 'cloud', 'name', 'allowed_delta_percentage', 'test_result_path', - 'number_of_workers', 'remote_user', 'remote_pass', 'test_method', - 'iperf_duration', 'tenant_type', 'tenants', 'external_host', 'ssh_gateway',) - - class TrafficSerializer(serializers.ModelSerializer): + tenants = TenantListSerializer(many=True, required=False) class Meta: model = Traffic - fields = ('id', 'cloud', 'name', 'allowed_delta_percentage', 'test_result_path', - 'number_of_workers', 'remote_user', 'remote_pass', 'test_method', - 'iperf_duration', 'tenant_type', 'tenants', 'external_host', 'ssh_gateway',) + exclude = ('creator', 'updated_on',) + + def create(self, validated_data): + # get tenants + tenants_data = validated_data.pop("tenants") + # create traffic instance + traffic = self.Meta.model.objects.create(**validated_data) + for tenant_id in tenants_data: + traffic.tenants.add(tenant_id) + traffic.save() + return traffic + + def update(self, instance, validated_data): + # get tenants + instance.tenants.clear() + tenants_data = validated_data.pop("tenants") + for tenant in tenants_data: + tenant_obj = Tenant.objects.filter(**tenant).get() + instance.tenants.add(tenant_obj) + instance.save() + return instance diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index 303e28b..e54932f 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -24,6 +24,18 @@ class TenantViewSet(viewsets.ModelViewSet): serializer_class = TenantSerializer authentication_classes = (JSONWebTokenAuthentication,) permission_classes = (IsAuthenticated,) + action_serializers = { + 'retrieve': TenantSerializer, + 'list': TenantListSerializer, + 'create': TenantSerializer, + 'update': TenantSerializer, + } + + def get_serializer_class(self): + if hasattr(self, 'action_serializers'): + if self.action in self.action_serializers: + return self.action_serializers[self.action] + return super(TrafficViewSet, self).get_serializer_class() def list(self, request, *args, **kwargs): cloud_id = self.request.GET.get("cloud_id") @@ -96,34 +108,13 @@ def list(self, request, *args, **kwargs): serializer = self.get_serializer(queryset, many=True) return Response(serializer.data) - def parse_tenants(self): - return ",".join([str(x) for x in self.request.data.get("tenants", [])]) - - def create(self, request, *args, **kwargs): - import pdb - pdb.set_trace() - serializer = self.get_serializer(data=request.data) - serializer.is_valid(raise_exception=True) - self.perform_create(serializer) - headers = self.get_success_headers(serializer.data) - return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) - def perform_create(self, serializer): - - import pdb - pdb.set_trace() - serializer.save( - # tenants=self.parse_tenants(), + tenants=self.request.data.getlist("tenants[]"), creator=self.request.user, cloud_id=self.request.data.get("cloud_id") ) - def perform_update(self, serializer): - serializer.save( - tenants=self.parse_tenants(), - ) - @detail_route(methods=["get"], url_path="test") def test(self, request, pk=None): return Response("hey") \ No newline at end of file diff --git a/ntt_tool/static/js/apps/controllers/trafficcontroller.js b/ntt_tool/static/js/apps/controllers/trafficcontroller.js index 02e0040..18282f0 100644 --- a/ntt_tool/static/js/apps/controllers/trafficcontroller.js +++ b/ntt_tool/static/js/apps/controllers/trafficcontroller.js @@ -22,7 +22,7 @@ nttApp.controller('TrafficCtrl', function($scope, $routeParams, $location, traff "cloud_id": $scope.cloudId, "tenant_type": "all", "test_method": "icmp", - "tenants": [] + "tenants": [], }; if ($scope.event == "edit"){ @@ -35,7 +35,22 @@ nttApp.controller('TrafficCtrl', function($scope, $routeParams, $location, traff $scope.tenants = []; $scope.getTenants = function(){ tenantService.list($scope.cloudId).then(function(response){ - $scope.tenants = response; + if ($scope.event == 'add'){ + $scope.tenants = response; + } + else { + angular.forEach(response, function(tenant, i){ + var isSelected = false; + angular.forEach($scope.cloudTraffic.tenants, function(selectedTenant, j){ + if (tenant.tenant_name == selectedTenant.tenant_name){ + isSelected = true; + } + }); + if (!isSelected){ + $scope.tenants.push(tenant); + } + }); + } }); }; if($scope.event == 'add'){ @@ -59,16 +74,14 @@ nttApp.controller('TrafficCtrl', function($scope, $routeParams, $location, traff angular.forEach($scope.cloudTraffic.tenants, function(item, index){ selectedList.push(item.id); }); - return JSON.stringify(selectedList); + console.log(selectedList) + return selectedList; }; $scope.save = function(){ - - var cloudTraffic = angular.copy($scope.cloudTraffic); - cloudTraffic["tenants"] = $scope.getSelectedTenants(); - console.log(cloudTraffic) if($scope.event == "add") { - trafficService.create(cloudTraffic).then(function (response) { + $scope.cloudTraffic["tenants"] = $scope.getSelectedTenants() + trafficService.create($scope.cloudTraffic).then(function (response) { $location.path("cloud/view/" + $scope.cloudId + "/"); }); } From 217615a0de3d6264bcc8e483e5f1f6d0875cfb9b Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Mon, 21 Mar 2016 16:15:21 +0530 Subject: [PATCH 18/57] Added feature to upload image and launch VM on network --- .../apps/cloud/migrations/0001_initial.py | 4 +- .../migrations/0002_auto_20160318_1057.py | 37 ++++++++++ .../migrations/0003_auto_20160318_1153.py | 47 ++++++++++++ .../migrations/0004_auto_20160321_0621.py | 52 ++++++++++++++ .../migrations/0005_auto_20160321_0630.py | 52 ++++++++++++++ .../migrations/0006_auto_20160321_0634.py | 30 ++++++++ ntt_tool/apps/cloud/models.py | 6 ++ .../apps/cloud/scripts/keystoneclientutils.py | 7 ++ .../cloud/scripts/openstackclientutils.py | 14 +--- .../cloud/scripts/tenantnetworkdiscovery.py | 66 +++++++++++++---- ntt_tool/apps/cloud/views.py | 28 ++++++++ ntt_tool/settings.py | 3 +- .../js/apps/controllers/cloudcontroller.js | 71 +++++++------------ .../js/apps/controllers/trafficcontroller.js | 8 ++- .../static/js/apps/services/trafficservice.js | 6 +- .../static/partials/cloud/cloud_form.html | 2 +- .../partials/cloud/tenants/tenants_list.html | 8 ++- .../partials/cloud/traffic/traffic_form.html | 16 +++-- .../partials/cloud/traffic/traffic_list.html | 4 +- .../partials/cloud/traffic/traffic_test.html | 28 +++++++- requirements.txt | 5 +- 21 files changed, 406 insertions(+), 88 deletions(-) create mode 100644 ntt_tool/apps/cloud/migrations/0002_auto_20160318_1057.py create mode 100644 ntt_tool/apps/cloud/migrations/0003_auto_20160318_1153.py create mode 100644 ntt_tool/apps/cloud/migrations/0004_auto_20160321_0621.py create mode 100644 ntt_tool/apps/cloud/migrations/0005_auto_20160321_0630.py create mode 100644 ntt_tool/apps/cloud/migrations/0006_auto_20160321_0634.py diff --git a/ntt_tool/apps/cloud/migrations/0001_initial.py b/ntt_tool/apps/cloud/migrations/0001_initial.py index dd606f2..aa6d7a7 100644 --- a/ntt_tool/apps/cloud/migrations/0001_initial.py +++ b/ntt_tool/apps/cloud/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-16 07:39 +# Generated by Django 1.9.2 on 2016-03-18 10:33 from __future__ import unicode_literals from django.conf import settings @@ -37,8 +37,10 @@ class Migration(migrations.Migration): name='Network', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('network_id', models.CharField(max_length=255)), ('network_name', models.CharField(max_length=255)), ('network_cidr', models.CharField(max_length=255)), + ('shared', models.BooleanField(default=False)), ('subnet', models.CharField(blank=True, max_length=255, null=True)), ('status', models.CharField(max_length=25)), ('created_on', models.DateTimeField(auto_now=True)), diff --git a/ntt_tool/apps/cloud/migrations/0002_auto_20160318_1057.py b/ntt_tool/apps/cloud/migrations/0002_auto_20160318_1057.py new file mode 100644 index 0000000..87af7a3 --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0002_auto_20160318_1057.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-18 10:57 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('cloud', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='network', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 10, 57, 43, 702918, tzinfo=utc)), + ), + migrations.AlterField( + model_name='network', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 10, 57, 43, 702965, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 10, 57, 43, 704316, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 10, 57, 43, 704362, tzinfo=utc)), + ), + ] diff --git a/ntt_tool/apps/cloud/migrations/0003_auto_20160318_1153.py b/ntt_tool/apps/cloud/migrations/0003_auto_20160318_1153.py new file mode 100644 index 0000000..aba173d --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0003_auto_20160318_1153.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-18 11:53 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('cloud', '0002_auto_20160318_1057'), + ] + + operations = [ + migrations.AlterField( + model_name='network', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 11, 52, 59, 534942, tzinfo=utc)), + ), + migrations.AlterField( + model_name='network', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 11, 52, 59, 534987, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 11, 52, 59, 536327, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 11, 52, 59, 536372, tzinfo=utc)), + ), + migrations.AlterField( + model_name='tenant', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 11, 52, 59, 533215, tzinfo=utc)), + ), + migrations.AlterField( + model_name='tenant', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 18, 11, 52, 59, 533260, tzinfo=utc)), + ), + ] diff --git a/ntt_tool/apps/cloud/migrations/0004_auto_20160321_0621.py b/ntt_tool/apps/cloud/migrations/0004_auto_20160321_0621.py new file mode 100644 index 0000000..2c1b595 --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0004_auto_20160321_0621.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-21 06:21 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('cloud', '0003_auto_20160318_1153'), + ] + + operations = [ + migrations.AddField( + model_name='tenant', + name='is_dirty', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='network', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 21, 29, 228959, tzinfo=utc)), + ), + migrations.AlterField( + model_name='network', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 21, 29, 229004, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 21, 29, 230319, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 21, 29, 230377, tzinfo=utc)), + ), + migrations.AlterField( + model_name='tenant', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 21, 29, 227286, tzinfo=utc)), + ), + migrations.AlterField( + model_name='tenant', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 21, 29, 227333, tzinfo=utc)), + ), + ] diff --git a/ntt_tool/apps/cloud/migrations/0005_auto_20160321_0630.py b/ntt_tool/apps/cloud/migrations/0005_auto_20160321_0630.py new file mode 100644 index 0000000..ddfcdb2 --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0005_auto_20160321_0630.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-21 06:30 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('cloud', '0004_auto_20160321_0621'), + ] + + operations = [ + migrations.AddField( + model_name='network', + name='is_dirty', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='network', + name='created_on', + field=models.DateTimeField(auto_now=True), + ), + migrations.AlterField( + model_name='network', + name='updated_on', + field=models.DateTimeField(auto_now_add=True), + ), + migrations.AlterField( + model_name='router', + name='created_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 30, 16, 414423, tzinfo=utc)), + ), + migrations.AlterField( + model_name='router', + name='updated_on', + field=models.DateTimeField(default=datetime.datetime(2016, 3, 21, 6, 30, 16, 414470, tzinfo=utc)), + ), + migrations.AlterField( + model_name='tenant', + name='created_on', + field=models.DateTimeField(auto_now=True), + ), + migrations.AlterField( + model_name='tenant', + name='updated_on', + field=models.DateTimeField(auto_now_add=True), + ), + ] diff --git a/ntt_tool/apps/cloud/migrations/0006_auto_20160321_0634.py b/ntt_tool/apps/cloud/migrations/0006_auto_20160321_0634.py new file mode 100644 index 0000000..47f9179 --- /dev/null +++ b/ntt_tool/apps/cloud/migrations/0006_auto_20160321_0634.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-21 06:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cloud', '0005_auto_20160321_0630'), + ] + + operations = [ + migrations.AddField( + model_name='router', + name='is_dirty', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='router', + name='created_on', + field=models.DateTimeField(auto_now=True), + ), + migrations.AlterField( + model_name='router', + name='updated_on', + field=models.DateTimeField(auto_now_add=True), + ), + ] diff --git a/ntt_tool/apps/cloud/models.py b/ntt_tool/apps/cloud/models.py index ef5cae8..ef6a6b4 100644 --- a/ntt_tool/apps/cloud/models.py +++ b/ntt_tool/apps/cloud/models.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User from django.db import models +from django.utils import timezone class Cloud(models.Model): @@ -23,6 +24,7 @@ class Tenant(models.Model): tenant_name = models.CharField(max_length=256) description = models.CharField(max_length=256, blank=True, null=True) enabled = models.BooleanField(default=False) + is_dirty = models.BooleanField(default=False) creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -33,10 +35,13 @@ class Meta: class Network(models.Model): tenant = models.ForeignKey(Tenant, related_name="networks") + network_id = models.CharField(max_length=255) network_name = models.CharField(max_length=255) network_cidr = models.CharField(max_length=255) + shared = models.BooleanField(default=False) subnet = models.CharField(max_length=255, blank=True, null=True) status = models.CharField(max_length=25) + is_dirty = models.BooleanField(default=False) creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) @@ -50,6 +55,7 @@ class Router(models.Model): router_id = models.CharField(max_length=255) router_name = models.CharField(max_length=255) status = models.CharField(max_length=25) + is_dirty = models.BooleanField(default=False) creator = models.ForeignKey(User, blank=True, null=True) created_on = models.DateTimeField(auto_now=True) updated_on = models.DateTimeField(auto_now_add=True) diff --git a/ntt_tool/apps/cloud/scripts/keystoneclientutils.py b/ntt_tool/apps/cloud/scripts/keystoneclientutils.py index 0a28745..0f8ab58 100644 --- a/ntt_tool/apps/cloud/scripts/keystoneclientutils.py +++ b/ntt_tool/apps/cloud/scripts/keystoneclientutils.py @@ -4,3 +4,10 @@ class KeystoneClientUtils(OpenStackClientUtils): client_class = keystone_client.Client + + def __init__(self, **credentials): + super(KeystoneClientUtils, self).__init__(**credentials) + self.keystone = self.get_client_instance() + + def get_token(self): + return self.keystone.auth_ref.get("token", {}).get("id") \ No newline at end of file diff --git a/ntt_tool/apps/cloud/scripts/openstackclientutils.py b/ntt_tool/apps/cloud/scripts/openstackclientutils.py index 765e5ba..1ee1fb2 100644 --- a/ntt_tool/apps/cloud/scripts/openstackclientutils.py +++ b/ntt_tool/apps/cloud/scripts/openstackclientutils.py @@ -1,18 +1,10 @@ class OpenStackClientUtils(object): - def __init__(self, username, password, auth_url, tenant_name=None): - self.username = username - self.password = password - self.auth_url = auth_url - self.tenant_name = tenant_name + def __init__(self, **credentials): + self.credentials = credentials def get_credentials(self): - return { - "username": self.username, - "password": self.password, - "auth_url": self.auth_url, - "tenant_name": self.tenant_name - } + return self.credentials def get_client_instance(self): credentials = self.get_credentials() diff --git a/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py b/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py index b910e17..1f99edd 100644 --- a/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py +++ b/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py @@ -1,4 +1,5 @@ from django.db import transaction +from django.utils import timezone from keystoneclientutils import KeystoneClientUtils from neutronclientutils import NeutronClientUtils from ntt_tool.apps.cloud.models import Tenant, Network, Router @@ -18,49 +19,88 @@ def get_networks_and_routers(self, user, cloud_id, tenants): neutron = self.get_client_instance() discovery_result = [] - with transaction.atomic(): - Tenant.objects.filter(cloud_id=cloud_id).delete() + discovery_datetime = timezone.now() + Tenant.objects.filter(cloud_id=cloud_id).update(is_dirty=False) for tenant in tenants: - tenant_obj = Tenant() + tenant_obj = None + try: + tenant_obj = Tenant.objects.filter(tenant_name=tenant.name).get() + except Tenant.DoesNotExist: + tenant_obj = Tenant() tenant_obj.cloud_id = cloud_id tenant_obj.tenant_id = tenant.id tenant_obj.tenant_name = tenant.name tenant_obj.description = tenant.description tenant_obj.enabled = tenant.enabled tenant_obj.creator = user + tenant_obj.is_dirty = True + tenant_obj.updated_on = discovery_datetime tenant_obj.save() - # ToDo: Need to update status, vlan, network_cidr - networks_list = [] + # Setting all records belongs to tenant as not dirty/updated + Network.objects.filter(tenant__tenant_id=tenant.id)\ + .update(is_dirty=False) networks = neutron.list_networks(tenant_id=tenant.id) for network in networks.get("networks", []): - network_obj = Network() + network_obj = None + try: + filters = { + "tenant__tenant_id": tenant.id, + "network_name": network.get("name") + } + network_obj = Network.objects.filter(**filters).get() + except Network.DoesNotExist: + network_obj = Network() network_obj.tenant = tenant_obj + network_obj.network_id = network.get("id") network_obj.network_name = network.get("name") + network_obj.shared = network.get("shared") # ToDo: We are assuming that each network is having only one subnet # ToDo: Need to handle the scenario if we add more than one subnet for a network if network.get("subnets"): subnet_list = neutron.list_subnets(id=network.get("subnets")) network_obj.network_cidr = subnet_list.get("subnets")[0].get("cidr") network_obj.status = network.get("status") + network_obj.is_dirty = True network_obj.creator = user - networks_list.append(network_obj) - Network.objects.bulk_create(networks_list) + network_obj.updated_on = discovery_datetime + network_obj.save() + # Deleting networks which are not got changed after discovery + Network.objects.filter(tenant__tenant_id=tenant_obj.id)\ + .filter(is_dirty=False).delete() - # ToDo: Need to update status - routers_list = [] + # Setting all records belongs to tenant as not dirty/updated + Router.objects.filter(tenant__tenant_id=tenant.id)\ + .update(is_dirty=False) routers = neutron.list_routers(tenant_id=tenant.id) for router in routers.get("routers", []): - router_obj = Router() + router_obj = None + try: + filters = { + "tenant__tenant_id": tenant.id, + "router_name": router.get("name") + } + router_obj = Router.objects.filter(**filters).get() + except Router.DoesNotExist: + router_obj = Router() + router_obj.created_on = discovery_datetime router_obj.tenant = tenant_obj router_obj.router_id = router.get("id") router_obj.router_name = router.get("name") router_obj.status = router.get("status") + router_obj.is_dirty = True router_obj.creator = user - routers_list.append(router_obj) - Router.objects.bulk_create(routers_list) + router_obj.updated_on = discovery_datetime + router_obj.save() + # Deleting routers which are got changed after discovery + Router.objects.filter(tenant__tenant_id=tenant_obj.id)\ + .filter(is_dirty=False).delete() + + # Deleting tenants which are got changed after discovery + Tenant.objects.filter(cloud_id=cloud_id)\ + .filter(is_dirty=False).delete() serializer = TenantSerializer(tenant_obj) discovery_result.append(serializer.data) diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index e54932f..74be7fb 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -6,6 +6,7 @@ from rest_framework_jwt.authentication import JSONWebTokenAuthentication from models import * from serializers import * +from scripts.novaclientutils import NovaClientUtils from scripts.tenantnetworkdiscovery import TenantDiscovery, NetworkRouterDiscovery @@ -115,6 +116,33 @@ def perform_create(self, serializer): cloud_id=self.request.data.get("cloud_id") ) + @detail_route(methods=["get"], url_path="vm/launch") + def launch_vm(self, request, pk=None): + traffic = None + try: + traffic = Traffic.objects.get(pk=pk) + except Cloud.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + + credentials = { + "username": traffic.cloud.keystone_user, + "api_key": traffic.cloud.keystone_password, + "auth_url": traffic.cloud.keystone_auth_url, + "project_id": traffic.cloud.keystone_tenant_name + } + nova = NovaClientUtils(**credentials) + + instances = [] + for tenant in traffic.tenants.all(): + for count, network in enumerate(tenant.networks.all()): + if not network.shared: + vm_name = "-".join([network.network_name, "vm", str(count)]) + instance = nova.launch_vm(tenant.tenant_id, + network.network_id, + vm_name) + instances.append(instance) + return Response(instances) + @detail_route(methods=["get"], url_path="test") def test(self, request, pk=None): return Response("hey") \ No newline at end of file diff --git a/ntt_tool/settings.py b/ntt_tool/settings.py index da11487..e6ba8c7 100644 --- a/ntt_tool/settings.py +++ b/ntt_tool/settings.py @@ -127,8 +127,9 @@ STATIC_URL = '/static/' STATICFILES_DIRS = [ - os.path.join(BASE_DIR, "ntt_tool/static") + os.path.join(BASE_DIR, os.path.join("ntt_tool", "static")) ] +MEDIA_ROOT = os.path.join(BASE_DIR, os.path.join("ntt_tool", "media")) REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, diff --git a/ntt_tool/static/js/apps/controllers/cloudcontroller.js b/ntt_tool/static/js/apps/controllers/cloudcontroller.js index 40e2ded..431ecc6 100644 --- a/ntt_tool/static/js/apps/controllers/cloudcontroller.js +++ b/ntt_tool/static/js/apps/controllers/cloudcontroller.js @@ -27,57 +27,34 @@ nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudSe cloudService.get($scope.id).then(function(data){ $scope.cloud = data; }); - }; + } $scope.save = function(){ - cloudService.create($scope.cloud).then(function(data){ - $location.path("cloud/view/" + data.id + "/"); - }); + if ($scope.event == "add") { + cloudService.create($scope.cloud).then(function (response) { + $location.path("cloud/view/" + response.id + "/"); + }); + } + else { + cloudService.update($scope.cloud.id, $scope.cloud).then(function(response){ + $location.path("cloud/view/" + response.id + "/"); + }); + } }; -}); - - - - -//nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudService, cloudTrafficService){ -// $scope.cloudId = $routeParams.cloudId; -// $scope.event = $routeParams.event; -// $scope.cloud = {}; -// $scope.cloudTrafficList = []; -// -// if ($scope.cloudId != undefined){ -// cloudService.get($scope.cloudId).then(function(data){ -// $scope.cloud = data; -// }); -// -// cloudTrafficService.list($scope.cloudId).then(function (data) { -// $scope.cloudTrafficList = data; -// }) -// }; -// -// $scope.save = function(){ -// if ($scope.event == 'add'){ -// cloudService.create($scope.cloud).then(function (data) { -// $location.path("cloudtraffic/add/"+ data.id +"/"); -// }); -// } -// else { -// cloudService.update($scope.cloud.id, $scope.cloud).then(function(data){ -// $location.path("cloud/"+$scope.cloud.id+"/"); -// }); -// }; -// -// }; -// -// $scope.deleteTraffic = function($index){ -// if(confirm("Are you sure want to delete?")) { -// cloudTrafficService.delete($scope.cloudTrafficList[$index].id).then(function (data) { -// $scope.cloudTrafficList.splice($index, 1); -// }); -// } -// } -//}); + $scope.saveAndDiscover = function(){ + if ($scope.event == "add") { + cloudService.create($scope.cloud).then(function(response){ + $location.path("/cloud/tenant/discovery/" + response.id + "/"); + }); + } + else { + cloudService.update($scope.cloud.id, $scope.cloud).then(function(response){ + $location.path("/cloud/tenant/discovery/" + response.id + "/"); + }); + } + } +}); diff --git a/ntt_tool/static/js/apps/controllers/trafficcontroller.js b/ntt_tool/static/js/apps/controllers/trafficcontroller.js index 18282f0..1ef8373 100644 --- a/ntt_tool/static/js/apps/controllers/trafficcontroller.js +++ b/ntt_tool/static/js/apps/controllers/trafficcontroller.js @@ -98,8 +98,12 @@ nttApp.controller('TrafficTestCtrl', function ($scope, $routeParams, trafficServ $scope.cloudId = $routeParams.cloudId; $scope.showLoading = true; $scope.testResult = {}; + $scope.vmLaunchStatus = []; - trafficService.test($scope.id).then(function(response){ - console.log(response); + $scope.status = "Launching VM(s) on selected networks"; + trafficService.launchVM($scope.id).then(function(response){ + $scope.status = "Successfully launched VM(s) on selected networks" + $scope.showLoading = false; + $scope.vmLaunchStatus = response; }); }); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/services/trafficservice.js b/ntt_tool/static/js/apps/services/trafficservice.js index 4f9eb0e..d6a73a0 100644 --- a/ntt_tool/static/js/apps/services/trafficservice.js +++ b/ntt_tool/static/js/apps/services/trafficservice.js @@ -19,9 +19,13 @@ nttApp.service('trafficService', function(dataService){ return dataService.delete('/api/traffic/'+pk+'/'); }; + this.launchVM = function(pk){ + return dataService.get('/api/traffic/' + pk + '/vm/launch/'); + }; + this.test = function(pk){ return dataService.get('/api/traffic/' + pk + '/test/'); - } + }; }); diff --git a/ntt_tool/static/partials/cloud/cloud_form.html b/ntt_tool/static/partials/cloud/cloud_form.html index 5c2a715..97d5205 100644 --- a/ntt_tool/static/partials/cloud/cloud_form.html +++ b/ntt_tool/static/partials/cloud/cloud_form.html @@ -37,7 +37,7 @@

      {$ event | capitalize:true $} Cloud

      Cancel - +
      diff --git a/ntt_tool/static/partials/cloud/tenants/tenants_list.html b/ntt_tool/static/partials/cloud/tenants/tenants_list.html index 937a617..401473c 100644 --- a/ntt_tool/static/partials/cloud/tenants/tenants_list.html +++ b/ntt_tool/static/partials/cloud/tenants/tenants_list.html @@ -7,11 +7,15 @@

      Tenants

      - + - +
      Tenant NameEnabledStatus
      {$ item.tenant_name $}{$ item.enabled $} + + {$ item.enabled === true ? "Enabled" : "Disabled" $} + +
      diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_form.html b/ntt_tool/static/partials/cloud/traffic/traffic_form.html index 7abe2b6..d9d16a4 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_form.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_form.html @@ -116,12 +116,16 @@

      {$ event | capitalize:true $} Traffic

      - + - +
      Tenant NameEnabledStatus
      {$ tenant.tenant_name $}{$ tenant.enabled $} + + {$ item.enabled === true ? "Enabled" : "Disabled" $} + +
      @@ -138,12 +142,16 @@

      {$ event | capitalize:true $} Traffic

      Tenant Name - Enabled + Status {$ tenant.tenant_name $} - {$ tenant.enabled $} + + + {$ item.enabled === true ? "Enabled" : "Disabled" $} + +
      diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_list.html b/ntt_tool/static/partials/cloud/traffic/traffic_list.html index a998b04..84c7abc 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_list.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_list.html @@ -18,12 +18,12 @@

      Traffic

      {$ cloudTraffic.name $} - {$ cloudTraffic.allowed_delta_percentage $} % + {$ cloudTraffic.allowed_delta_percentage $}% {$ cloudTraffic.test_result_path $} {$ cloudTraffic.number_of_workers $} {$ cloudTraffic.remote_user $} {$ cloudTraffic.test_method $} - {$ cloudTraffic.iperf_duration $} sec + {$ cloudTraffic.iperf_duration $}sec {$ cloudTraffic.tenant_type $} diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_test.html b/ntt_tool/static/partials/cloud/traffic/traffic_test.html index 4f07059..7c053f9 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_test.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_test.html @@ -16,9 +16,33 @@

      Traffic Test

      -
      -
      +
      +
      + +
      +
      +
      +

      {$ status $}

      +
      +
      +
      +
      + +
      +
      {$ status $}
      + + + + + + + + + +
      VM NameVM Status
      {$ instance.instance_name $}{$ instance.instance_status $}
      + +
      \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 26906c3..1526d0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,9 @@ djangorestframework==3.3.2 djangorestframework-jwt==1.7.2 six==1.10.0 wsgiref==0.1.2 - +python-heatclient==0.6.0 python-keystoneclient==1.6.0 python-neutronclient==2.6.0 +python-novaclient==2.17.0 +python-swiftclient==2.4.0 +python-glanceclient==2.0.0 \ No newline at end of file From 41c3621479b404628dce01ec8cd01908b853801c Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Mon, 21 Mar 2016 16:16:49 +0530 Subject: [PATCH 19/57] Added ubuntu image --- .gitattributes | 1 + ntt_tool/media/osimages/ubuntu.img | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 .gitattributes create mode 100644 ntt_tool/media/osimages/ubuntu.img diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5713ac7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.img filter=lfs diff=lfs merge=lfs -text diff --git a/ntt_tool/media/osimages/ubuntu.img b/ntt_tool/media/osimages/ubuntu.img new file mode 100644 index 0000000..4264222 --- /dev/null +++ b/ntt_tool/media/osimages/ubuntu.img @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32d142beddf51b7439eebb319b9185458e9823f75355bf9b60531186e8030657 +size 259260928 From 8e6f011142c006803e2ba188aaa3ebdc3aa6ce13 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Mon, 21 Mar 2016 16:45:41 +0530 Subject: [PATCH 20/57] renamed scripts folder --- .../{scripts => openstackscripts}/__init__.py | 0 .../apps/cloud/openstackscripts/config.py | 29 ++++++ .../openstackscripts/glanceclientutils.py | 19 ++++ .../keystoneclientutils.py | 0 .../neutronclientutils.py | 0 .../cloud/openstackscripts/novaclientutils.py | 95 +++++++++++++++++++ .../openstackclientutils.py | 0 .../openstackscripts/openstackcredentials.py | 0 .../tenantnetworkdiscovery.py | 0 ntt_tool/apps/cloud/openstackscripts/user.txt | 7 ++ .../apps/cloud/openstackscripts/vmmanager.py | 11 +++ ntt_tool/apps/cloud/views.py | 4 +- 12 files changed, 163 insertions(+), 2 deletions(-) rename ntt_tool/apps/cloud/{scripts => openstackscripts}/__init__.py (100%) create mode 100644 ntt_tool/apps/cloud/openstackscripts/config.py create mode 100644 ntt_tool/apps/cloud/openstackscripts/glanceclientutils.py rename ntt_tool/apps/cloud/{scripts => openstackscripts}/keystoneclientutils.py (100%) rename ntt_tool/apps/cloud/{scripts => openstackscripts}/neutronclientutils.py (100%) create mode 100644 ntt_tool/apps/cloud/openstackscripts/novaclientutils.py rename ntt_tool/apps/cloud/{scripts => openstackscripts}/openstackclientutils.py (100%) create mode 100644 ntt_tool/apps/cloud/openstackscripts/openstackcredentials.py rename ntt_tool/apps/cloud/{scripts => openstackscripts}/tenantnetworkdiscovery.py (100%) create mode 100644 ntt_tool/apps/cloud/openstackscripts/user.txt create mode 100644 ntt_tool/apps/cloud/openstackscripts/vmmanager.py diff --git a/ntt_tool/apps/cloud/scripts/__init__.py b/ntt_tool/apps/cloud/openstackscripts/__init__.py similarity index 100% rename from ntt_tool/apps/cloud/scripts/__init__.py rename to ntt_tool/apps/cloud/openstackscripts/__init__.py diff --git a/ntt_tool/apps/cloud/openstackscripts/config.py b/ntt_tool/apps/cloud/openstackscripts/config.py new file mode 100644 index 0000000..2ad1591 --- /dev/null +++ b/ntt_tool/apps/cloud/openstackscripts/config.py @@ -0,0 +1,29 @@ +import os +from django.conf import settings + +# NOVA CONFIGS +NOVA_FLOATING_IP_CREATION = True +NOVA_FLOATING_IP_POOL = 'public' + +NOVA_IMAGE_NAME = "ubuntu" + +NOVA_QUOTA_INSTANCES = -1 +NOVA_QUOTA_CORES = -1 +NOVA_QUOTA_RAM = -1 +NOVA_QUOTA_FIXED_IPS = -1 +NOVA_QUOTA_FLOATING_IPS = -1 + +NOVA_VM_FLAVOR = "traffic" +NOVA_VM_FLAVOR_RAM = 2048 # In Mega Bytes +NOVA_VM_FLAVOR_VCPUS = 1 +NOVA_VM_FLAVOR_DISK = 10 # In Giga Bytes + + +# GLANCE CONFIGS +GLANCE_ENDPOINT = "http://172.168.2.40:9292" + +GLANCE_IMAGE_NAME = NOVA_IMAGE_NAME +GLANCE_IMAGE_PATH = os.path.join(settings.MEDIA_ROOT, os.path.join("osimages", "ubuntu.img")) +GLANCE_IMAGE_DISK_FORMAT = "qcow2" +GLANCE_IMAGE_CONTAINER_FORMAT = "bare" + diff --git a/ntt_tool/apps/cloud/openstackscripts/glanceclientutils.py b/ntt_tool/apps/cloud/openstackscripts/glanceclientutils.py new file mode 100644 index 0000000..0962340 --- /dev/null +++ b/ntt_tool/apps/cloud/openstackscripts/glanceclientutils.py @@ -0,0 +1,19 @@ +from glanceclient.v2 import client as glance_client +from openstackclientutils import OpenStackClientUtils +from config import * + + +class GlanceClientUtils(OpenStackClientUtils): + client_class = glance_client.Client + + def __init__(self, **credentials): + super(GlanceClientUtils, self).__init__(**credentials) + self.glance = self.get_client_instance() + + def upload_image(self): + image = self.glance.images.create( + disk_format=GLANCE_IMAGE_DISK_FORMAT, + container_format=GLANCE_IMAGE_CONTAINER_FORMAT, + name=GLANCE_IMAGE_NAME) + self.glance.images.upload(image.id, open(GLANCE_IMAGE_PATH, 'rb')) + return image diff --git a/ntt_tool/apps/cloud/scripts/keystoneclientutils.py b/ntt_tool/apps/cloud/openstackscripts/keystoneclientutils.py similarity index 100% rename from ntt_tool/apps/cloud/scripts/keystoneclientutils.py rename to ntt_tool/apps/cloud/openstackscripts/keystoneclientutils.py diff --git a/ntt_tool/apps/cloud/scripts/neutronclientutils.py b/ntt_tool/apps/cloud/openstackscripts/neutronclientutils.py similarity index 100% rename from ntt_tool/apps/cloud/scripts/neutronclientutils.py rename to ntt_tool/apps/cloud/openstackscripts/neutronclientutils.py diff --git a/ntt_tool/apps/cloud/openstackscripts/novaclientutils.py b/ntt_tool/apps/cloud/openstackscripts/novaclientutils.py new file mode 100644 index 0000000..05ac6a7 --- /dev/null +++ b/ntt_tool/apps/cloud/openstackscripts/novaclientutils.py @@ -0,0 +1,95 @@ +import time +import os +from novaclient.v1_1 import client as nova_client +from novaclient.exceptions import NotFound +from openstackclientutils import OpenStackClientUtils +from keystoneclientutils import KeystoneClientUtils +from glanceclientutils import GlanceClientUtils +from config import * + + +class NovaClientUtils(OpenStackClientUtils): + client_class = nova_client.Client + + def __init__(self, **credentials): + super(NovaClientUtils, self).__init__(**credentials) + self.nova = self.get_client_instance() + + def assign_floating_ip(self, instance): + if NOVA_FLOATING_IP_CREATION: + floating_ip = self.nova.floating_ips.create(NOVA_FLOATING_IP_POOL) + instance.add_floating_ip(floating_ip) + return True + return False + + def launch_vm(self, tenant_id, network_id, vm_name): + """ + Launches VM on given tenant and network + :param tenant_id: + :param network_id: + :param vm_name: + :return: VM instance + """ + self.nova.quotas.update(tenant_id, + instances=NOVA_QUOTA_INSTANCES, + cores=NOVA_QUOTA_CORES, + ram=NOVA_QUOTA_RAM, + fixed_ips=NOVA_QUOTA_FIXED_IPS, + floating_ips=NOVA_QUOTA_FLOATING_IPS) + + user_data = None + user_data_file_path = os.path.join(os.path.dirname(__file__), 'user.txt') + with open(user_data_file_path, 'r') as f: + user_data = f.read() + + image = None + try: + image = self.nova.images.find(name=NOVA_IMAGE_NAME) + except NotFound: + # Uploading image if does not exist. + keystone_credentials = { + "username": self.credentials.get("username"), + "password": self.credentials.get("api_key"), + "auth_url": self.credentials.get("auth_url"), + "tenant_name": self.credentials.get("project_id") + } + keystone = KeystoneClientUtils(**keystone_credentials) + glance = GlanceClientUtils(endpoint=GLANCE_ENDPOINT, + token=keystone.get_token()) + image = glance.upload_image() + + # Creating flavor + flavor = None + try: + flavor = self.nova.flavors.find(name=NOVA_VM_FLAVOR) + except NotFound: + flavor = self.nova.flavors.create(name=NOVA_VM_FLAVOR, + ram=NOVA_VM_FLAVOR_RAM, + vcpus=NOVA_VM_FLAVOR_VCPUS, + disk=NOVA_VM_FLAVOR_DISK) + # Launching VM + instance = self.nova.servers.create(name=vm_name, + image=image, + flavor=flavor, + key_name="admin", + nics=[{'net-id': network_id}], + userdata=user_data) + + # Waiting and querying instance till instance status becomes active + while instance.status == 'BUILD': + time.sleep(10) + instance = self.nova.servers.get(instance.id) + + # Assigning floating IP to the instance + self.assign_floating_ip(instance) + + return { + "instance_name": vm_name, + "instance_status": instance.status + } + + + + + + diff --git a/ntt_tool/apps/cloud/scripts/openstackclientutils.py b/ntt_tool/apps/cloud/openstackscripts/openstackclientutils.py similarity index 100% rename from ntt_tool/apps/cloud/scripts/openstackclientutils.py rename to ntt_tool/apps/cloud/openstackscripts/openstackclientutils.py diff --git a/ntt_tool/apps/cloud/openstackscripts/openstackcredentials.py b/ntt_tool/apps/cloud/openstackscripts/openstackcredentials.py new file mode 100644 index 0000000..e69de29 diff --git a/ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py b/ntt_tool/apps/cloud/openstackscripts/tenantnetworkdiscovery.py similarity index 100% rename from ntt_tool/apps/cloud/scripts/tenantnetworkdiscovery.py rename to ntt_tool/apps/cloud/openstackscripts/tenantnetworkdiscovery.py diff --git a/ntt_tool/apps/cloud/openstackscripts/user.txt b/ntt_tool/apps/cloud/openstackscripts/user.txt new file mode 100644 index 0000000..294cbc2 --- /dev/null +++ b/ntt_tool/apps/cloud/openstackscripts/user.txt @@ -0,0 +1,7 @@ +#cloud-config +chpasswd: + list: | + root:ubuntu + ubuntu:ubuntu + expire: False +ssh_pwauth: True \ No newline at end of file diff --git a/ntt_tool/apps/cloud/openstackscripts/vmmanager.py b/ntt_tool/apps/cloud/openstackscripts/vmmanager.py new file mode 100644 index 0000000..e62d60a --- /dev/null +++ b/ntt_tool/apps/cloud/openstackscripts/vmmanager.py @@ -0,0 +1,11 @@ +from novaclientutils import NovaClientUtils +from glanceclientutils import GlanceClientUtils + + +class VMManager(NovaClientUtils, GlanceClientUtils): + + def check_status(self): + pass + + def destroy(self, vm_id=None): + pass diff --git a/ntt_tool/apps/cloud/views.py b/ntt_tool/apps/cloud/views.py index 74be7fb..0ea7d85 100644 --- a/ntt_tool/apps/cloud/views.py +++ b/ntt_tool/apps/cloud/views.py @@ -6,8 +6,8 @@ from rest_framework_jwt.authentication import JSONWebTokenAuthentication from models import * from serializers import * -from scripts.novaclientutils import NovaClientUtils -from scripts.tenantnetworkdiscovery import TenantDiscovery, NetworkRouterDiscovery +from openstackscripts.novaclientutils import NovaClientUtils +from openstackscripts.tenantnetworkdiscovery import TenantDiscovery, NetworkRouterDiscovery class CloudViewSet(viewsets.ModelViewSet): From 14bf998bc794b573f6fee7bf2f6111fc2ab3b082 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Mon, 21 Mar 2016 16:55:50 +0530 Subject: [PATCH 21/57] Fixed typo --- ntt_tool/static/partials/cloud/traffic/traffic_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_form.html b/ntt_tool/static/partials/cloud/traffic/traffic_form.html index d9d16a4..dc0457e 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_form.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_form.html @@ -149,7 +149,7 @@

      {$ event | capitalize:true $} Traffic

      {$ tenant.tenant_name $} - {$ item.enabled === true ? "Enabled" : "Disabled" $} + {$ tenant.enabled === true ? "Enabled" : "Disabled" $} From a5d7cd80228287b34cb2219ed2b77776422c5b58 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Mon, 21 Mar 2016 16:57:13 +0530 Subject: [PATCH 22/57] Fixed typo --- ntt_tool/static/partials/cloud/traffic/traffic_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntt_tool/static/partials/cloud/traffic/traffic_form.html b/ntt_tool/static/partials/cloud/traffic/traffic_form.html index dc0457e..7b56b15 100644 --- a/ntt_tool/static/partials/cloud/traffic/traffic_form.html +++ b/ntt_tool/static/partials/cloud/traffic/traffic_form.html @@ -123,7 +123,7 @@

      {$ event | capitalize:true $} Traffic

      {$ tenant.tenant_name $} - {$ item.enabled === true ? "Enabled" : "Disabled" $} + {$ tenant.enabled === true ? "Enabled" : "Disabled" $} From 5aedb7b62e01ed73ebbb1175256c9e6523999894 Mon Sep 17 00:00:00 2001 From: Abdul Gaffar Date: Thu, 24 Mar 2016 16:08:35 +0530 Subject: [PATCH 23/57] Tenant discovery design revamp --- .idea/workspace.xml | 439 ++++++++---------- ntt_tool/.gitignore | 1 - ntt_tool/static/css/custom.css | 5 + ntt_tool/static/js/apps/app.js | 7 +- .../js/apps/controllers/cloudcontroller.js | 24 +- .../js/apps/controllers/tenantcontroller.js | 28 +- .../static/js/apps/directives/directives.js | 3 + .../static/partials/cloud/cloud_form.html | 2 +- .../cloud/tenants/tenants_discovery.html | 122 +++-- .../partials/cloud/tenants/tenants_list.html | 17 +- ntt_tool/templates/base.html | 1 + 11 files changed, 303 insertions(+), 346 deletions(-) create mode 100644 ntt_tool/static/js/apps/directives/directives.js diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8bf6aa1..762a9a5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,17 @@ - - - - + - - - - + + + + + + + + + @@ -48,73 +50,61 @@ - - + + - - + + - - + + - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -127,8 +117,8 @@ @@ -138,9 +128,6 @@ @@ -199,9 +189,9 @@ @@ -228,7 +218,6 @@ - @@ -243,7 +232,7 @@ @@ -253,7 +242,7 @@ + @@ -644,6 +574,10 @@ + + + + @@ -651,10 +585,6 @@ - - - - @@ -923,27 +853,27 @@ - + - - + + - - + + @@ -961,9 +891,9 @@ - - + + @@ -995,21 +925,6 @@ - - - - - - - - - - - - - - - @@ -1024,13 +939,6 @@ - - - - - - - @@ -1109,13 +1017,6 @@ - - - - - - - @@ -1130,21 +1031,6 @@ - - - - - - - - - - - - - - - @@ -1152,13 +1038,6 @@ - - - - - - - @@ -1177,7 +1056,6 @@ - @@ -1185,11 +1063,10 @@ - - + @@ -1200,7 +1077,6 @@ - @@ -1208,18 +1084,17 @@ - - + - + @@ -1233,144 +1108,196 @@ - + - + - + - - - + + - + - - + + - + - - + + + + + + + + + - + - - + + - + - - + + - + - + - + - - + - + - - + - + - + - + - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - + - + + + + + + + + + - + - + - + - + - - - - - + + + - + - - + + - + + + + + + + + + + + + + + + + + - - + + diff --git a/ntt_tool/.gitignore b/ntt_tool/.gitignore index 2befe9f..e7c5e4b 100644 --- a/ntt_tool/.gitignore +++ b/ntt_tool/.gitignore @@ -130,4 +130,3 @@ atlassian-ide-plugin.xml com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties - diff --git a/ntt_tool/static/css/custom.css b/ntt_tool/static/css/custom.css index f459e94..8ffb353 100644 --- a/ntt_tool/static/css/custom.css +++ b/ntt_tool/static/css/custom.css @@ -110,6 +110,11 @@ td > a{ border: 1px solid #ddd; } +.modal-body { + max-height: calc(100vh - 210px); + overflow-y: auto; +} + /* widgets */ .card { border-radius: 2px; diff --git a/ntt_tool/static/js/apps/app.js b/ntt_tool/static/js/apps/app.js index 063b905..ae0b99c 100644 --- a/ntt_tool/static/js/apps/app.js +++ b/ntt_tool/static/js/apps/app.js @@ -81,9 +81,14 @@ nttApp.config(['$routeProvider', function($routeProvider){ controller: 'TrafficTestCtrl', templateUrl: '/static/partials/cloud/traffic/traffic_test.html' }); +}]); + + + + + -}]); diff --git a/ntt_tool/static/js/apps/controllers/cloudcontroller.js b/ntt_tool/static/js/apps/controllers/cloudcontroller.js index 431ecc6..172e2e5 100644 --- a/ntt_tool/static/js/apps/controllers/cloudcontroller.js +++ b/ntt_tool/static/js/apps/controllers/cloudcontroller.js @@ -42,18 +42,18 @@ nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudSe } }; - $scope.saveAndDiscover = function(){ - if ($scope.event == "add") { - cloudService.create($scope.cloud).then(function(response){ - $location.path("/cloud/tenant/discovery/" + response.id + "/"); - }); - } - else { - cloudService.update($scope.cloud.id, $scope.cloud).then(function(response){ - $location.path("/cloud/tenant/discovery/" + response.id + "/"); - }); - } - } + //$scope.saveAndDiscover = function(){ + // if ($scope.event == "add") { + // cloudService.create($scope.cloud).then(function(response){ + // $location.path("cloud/view/" + response.id + "/").search('discover', 'true'); + // }); + // } + // else { + // cloudService.update($scope.cloud.id, $scope.cloud).then(function(response){ + // $location.path("cloud/view/" + response.id + "/").search('discover', 'true'); + // }); + // } + //} }); diff --git a/ntt_tool/static/js/apps/controllers/tenantcontroller.js b/ntt_tool/static/js/apps/controllers/tenantcontroller.js index 0168e40..a8f6215 100644 --- a/ntt_tool/static/js/apps/controllers/tenantcontroller.js +++ b/ntt_tool/static/js/apps/controllers/tenantcontroller.js @@ -4,18 +4,30 @@ nttApp.controller('TenantListCtrl', function($scope, $routeParams, tenantService tenantService.list($scope.cloudId).then(function(response){ $scope.tenants = response; }); -}); - -nttApp.controller('TenantDiscoveryCtrl', function($scope, $routeParams, tenantService){ - $scope.cloudId = $routeParams.cloudId; - $scope.discoveryResult = {}; $scope.showLoading = true; $scope.discover = function(){ + $scope.showLoading = true; tenantService.discover($scope.cloudId).then(function(response){ $scope.showLoading = false; - $scope.discoveryResult = response; + $scope.tenants = response; }); }; - $scope.discover(); -}); \ No newline at end of file +}); + +//nttApp.controller('TenantDiscoveryCtrl', function($scope, $routeParams, tenantService){ +// console.log($routeParams) +// $scope.cloudId = $routeParams.id; +// $scope.discoveryResult = {}; +// console.log("1") +// $scope.showLoading = true; +// $scope.discover = function(){ +// console.log("2") +// tenantService.discover($scope.cloudId).then(function(response){ +// console.log("3") +// $scope.showLoading = false; +// $scope.discoveryResult = response; +// }); +// }; +// $scope.discover(); +//}); \ No newline at end of file diff --git a/ntt_tool/static/js/apps/directives/directives.js b/ntt_tool/static/js/apps/directives/directives.js new file mode 100644 index 0000000..2a548e4 --- /dev/null +++ b/ntt_tool/static/js/apps/directives/directives.js @@ -0,0 +1,3 @@ +/** + * Created by abdul on 24/3/16. + */ diff --git a/ntt_tool/static/partials/cloud/cloud_form.html b/ntt_tool/static/partials/cloud/cloud_form.html index 97d5205..2f151b6 100644 --- a/ntt_tool/static/partials/cloud/cloud_form.html +++ b/ntt_tool/static/partials/cloud/cloud_form.html @@ -37,7 +37,7 @@

      {$ event | capitalize:true $} Cloud

      Cancel - + diff --git a/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html b/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html index 3afd710..5e3b074 100644 --- a/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html +++ b/ntt_tool/static/partials/cloud/tenants/tenants_discovery.html @@ -1,75 +1,71 @@ - - -
      -
      -
      -
        -
      1. Cloud List
        2. -
      2. Cloud Details
        3. -
      3. Tenant Discovery
        4. -
      -
      -
      - -
      -
      -
      -

      Tenant Discovery

      -
      -
      -
      + +