From 8d39ce45c8ce7921c67ea8886cc3163ddf8f8c84 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 21 Sep 2012 18:14:20 +0200 Subject: [PATCH 1/7] bug #1487: add create_dirs function to install script --- flow/install.sh | 4 ++++ install_lib.sh | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/flow/install.sh b/flow/install.sh index 5903768aa7..6a0858ac7d 100755 --- a/flow/install.sh +++ b/flow/install.sh @@ -23,6 +23,10 @@ else LOG_LOCATION="$ROOT/var/appflow" fi +DIRECTORIES="$LIB_LOCATION $BIN_LOCATION $ETC_LOCATION $LOG_LOCATION" + +create_dirs $DIRECTORIES + ## Client files copy_files "client/lib/*" "$LIB_LOCATION/flow" copy_files "client/bin/*" "$BIN_LOCATION" diff --git a/install_lib.sh b/install_lib.sh index a540182f69..73986694da 100644 --- a/install_lib.sh +++ b/install_lib.sh @@ -82,3 +82,12 @@ copy_files() { done } +create_dirs() { + DIRS=$* + + for d in $DIRS; do + dir=$DESTDIR$d + mkdir -p $dir + done +} + From ce8c58f37aedf55aedd57163d5359a1b54620e9f Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 21 Sep 2012 18:24:03 +0200 Subject: [PATCH 2/7] Appflow: reset role fields when adding role. Delete as link instead of button --- .../js/user-plugins/apptools.appflow.templates.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js index 0b76aa9a3e..3d75377666 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js @@ -601,6 +601,7 @@ function setupCreateServiceTemplateDialog(){ var row = $(this).parents('tr'); removeParentRole(row.attr('name')); row.fadeOut().remove(); + return false; }); $('select[name="parents"]', dialog).change(function(){ @@ -651,13 +652,18 @@ function setupCreateServiceTemplateDialog(){ str += ''+ cardinality +''; str += ''+ template +''; str += ''+ parents.join(',') +''; - str += ''; + str += 'Delete'; str += ''; var ok = addParentRole(name); - if (ok) + if (ok){ $('table#current_roles tbody', dialog).append($(str).hide().fadeIn()); + $('input[name="name"]', context).val(""); + $('input[name="cardinality"]', context).val("1"); + //unselect selected parents + $('select[name="parents"] option[clicked="clicked"]').trigger('click'); + } else notifyError(tr("There is already a role with this name!")); From e902baa8f7969ad6221390bef251db89449223e6 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 24 Sep 2012 13:02:35 +0200 Subject: [PATCH 3/7] Add opennebula.js and move images installation --- apptools/install.sh | 3 +- .../share/sunstone/public/js/opennebula.js | 1055 +++++++++++++++++ .../sunstone/public/images/apptools_icon.png | Bin 10675 -> 0 bytes .../public/js/user-plugins/apptools.js | 77 -- env/install.sh | 1 + .../sunstone/public/images/appenv_icon.png | Bin flow/install.sh | 4 +- .../sunstone/public/images/appflow_icon.png | Bin market/install.sh | 4 +- .../sunstone/public/images/appmarket_icon.png | Bin 10 files changed, 1061 insertions(+), 83 deletions(-) create mode 100644 apptools/share/sunstone/public/js/opennebula.js delete mode 100644 apptools/sunstone/public/images/apptools_icon.png delete mode 100644 apptools/sunstone/public/js/user-plugins/apptools.js rename {apptools => env}/sunstone/public/images/appenv_icon.png (100%) rename {apptools => flow}/sunstone/public/images/appflow_icon.png (100%) rename {apptools => market}/sunstone/public/images/appmarket_icon.png (100%) diff --git a/apptools/install.sh b/apptools/install.sh index 5234b1c4d1..d751dda0ed 100755 --- a/apptools/install.sh +++ b/apptools/install.sh @@ -17,6 +17,5 @@ . ../install_lib.sh -copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images" -copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins" +copy_files "share/*" "$SHARE_LOCATION" diff --git a/apptools/share/sunstone/public/js/opennebula.js b/apptools/share/sunstone/public/js/opennebula.js new file mode 100644 index 0000000000..e5feba7291 --- /dev/null +++ b/apptools/share/sunstone/public/js/opennebula.js @@ -0,0 +1,1055 @@ +/* -------------------------------------------------------------------------- */ +/* Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) */ +/* */ +/* Licensed under the Apache License, Version 2.0 (the "License"); you may */ +/* not use this file except in compliance with the License. You may obtain */ +/* a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ +/* See the License for the specific language governing permissions and */ +/* limitations under the License. */ +/* -------------------------------------------------------------------------- */ + +var OpenNebula = { + + "Error": function(resp) + { + var error = {}; + if (resp.responseText) + { + try { + error = JSON.parse(resp.responseText); + } + catch (e) { + error.error = {message: "It appears there was a server exception. Please check server's log."}; + }; + } + else + { + error.error = {}; + } + error.error.http_status = resp.status; + return error; + }, + + "is_error": function(obj) + { + return obj.error ? true : false; + }, + + "Helper": { + "resource_state": function(type, value) + { + var state; + switch(type) + { + case "HOST": + case "host": + state = tr(["INIT", + "MONITORING_MONITORED", + "MONITORED", + "ERROR", + "DISABLED", + "MONITORING_ERROR"][value]); + break; + case "HOST_SIMPLE": + case "host_simple": + state = tr(["INIT", + "UPDATE", + "ON", + "ERROR", + "OFF", + "RETRY"][value]); + break; + case "VM": + case "vm": + state = tr(["INIT", + "PENDING", + "HOLD", + "ACTIVE", + "STOPPED", + "SUSPENDED", + "DONE", + "FAILED", + "POWEROFF"][value]); + break; + case "VM_LCM": + case "vm_lcm": + state = tr(["LCM_INIT", + "PROLOG", + "BOOT", + "RUNNING", + "MIGRATE", + "SAVE_STOP", + "SAVE_SUSPEND", + "SAVE_MIGRATE", + "PROLOG_MIGRATE", + "PROLOG_RESUME", + "EPILOG_STOP", + "EPILOG", + "SHUTDOWN", + "CANCEL", + "FAILURE", + "CLEANUP", + "UNKNOWN", + "HOTPLUG", + "SHUTDOWN_POWEROFF"][value]); + break; + case "IMAGE": + case "image": + state = tr(["INIT", + "READY", + "USED", + "DISABLED", + "LOCKED", + "ERROR", + "CLONE", + "DELETE", + "USED_PERS"][value]); + break; + case "VM_MIGRATE_REASON": + case "vm_migrate_reason": + state = tr(["NONE", + "ERROR", + "STOP_RESUME", + "USER", + "CANCEL"][value]); + break; + default: + return value; + } + if (!state) state = value + return state; + }, + + "image_type": function(value) + { + return ["OS", "CDROM", "DATABLOCK"][value]; + }, + + "action": function(action, params) + { + obj = { + "action": { + "perform": action + } + } + if (params) + { + obj.action.params = params; + } + return obj; + }, + + "request": function(resource, method, data) { + var r = { + "request": { + "resource" : resource, + "method" : method + } + } + if (data) + { + if (typeof(data) != "array") + { + data = [data]; + } + r.request.data = data; + } + return r; + }, + + "pool": function(resource, response) + { + var pool_name = resource + "_POOL"; + var type = resource; + var pool; + + if (typeof(pool_name) == "undefined") + { + return Error('Incorrect Pool'); + } + + var p_pool = []; + + if (response[pool_name]) { + pool = response[pool_name][type]; + } else { pull = null }; + + if (pool == null) + { + return p_pool; + } + else if (pool.length) + { + for (i=0;i?z)6B=v!_mjz=9L4; z-``)t+5M%rosFl1gvTqVoGoQG5a&CqJ_2PEBOrE`8*|8)%Z;ZrAD%@sI5>wFE7Lm5doa(02wAGzibK9$TgD zj={sF_2hNJ^?Z;8qPO^X-Zat8@QA>JZyc-f-HcnK0ZWjDn0j$k7X~ek1l=Lo3FGC6 z;ceIIJfko;ap5E!-D_TJyf=pZPgxta{ zM8U%1f+;5cGl0L!5Ym9S;X{o%qv&aNF-|W^*B-?L>zUvz#%)5?_ushT9~wh=G$NG| z_JGm*CoXmfXpB`E8OK(+8sG?d0^{{#MvH@^1M)s7afbRLN;T<>2|4Zp{`Cz;&XX;e_Y&cbcpmoR0GXRVGw)jU6)x@=w*Ik z%VUwxr@`YQhO(^JYiVQ3@_f4@$Hzly;Nh?VRepN%V==#)fGgMeqN6^CLd)VG$b|EA)7%oPP{yHK7;22 zj>iWHujFW8=rQFDhYwF%IdVlx36gMr4mx;1@P`fc>aaEN^q9sFkA(R?W*dfV8RN1k zbjRLZYH9z0@uPHg{C4g`Ow*}}qG@mTjBe|dx&{qlIDB<7K&I;&&9u|DLpVD3qzn zKQ&KWh#hZet6auJ=t*gN6~}d6v3m0F9K>~Q_ZcA`9xBaL<1@_!Lc!-3?tmK&KNPe?;CY3N zO|23o7G^}svF1_Uj61Ga!b)(DDL43%5tHHdME8K%bc$5p7OC*lS6#~$ z8~&Q}irwic1jX3BIPG-x%{m;8wIjgUIc~ zFp5mN!C6N|N1m?Gb&bKTt;ESynkP=^D+Amq$qsKH#jV$jcJMwcTh9D0T-dwCxO|ay zd&9*V;u;Y+XSjBPTF1HmUpdW_wJzAu6UCKY;jBB%$Ty7A{zCF>Sq#;A@}!vBqMAA| zYbj%}*^};a8Q2iU7fIJT&7-n%D<7POe$K~WxlKGrBtP;FS2B6W8#W~BgG9G-F#9r` z6dO&28G0WYkZZ@P8%YknJ5Ui&%3Bc(6BIuy_!K19Q|ZP$KeH(HCn^ToT;6a^8VdknTvznpS*EiNxU z6xv!}I-w;J;@#7|DE>%kpS~tpHeC`vz#Q5bp(D{0wb=X8__%q?bv<3(+wgM+*vTx( zH+FZ7&IdVH{lYTcxh!SA#|Qbu5NE-Cx34lDmucKE=MOcmu?7p&>ql<_GQkv=O|Bdf zeA3w6V;bp;obzP0khtUU`&}EYN&+L!Tiv;Pr|{F00@a|!Ftq3I@5RQPkI^46?yHo9 zxQBBkj2FZ^VT)#w;b5_;^m)gg*8;xOjxQrhDawdfTV5eT^H!ko92$bBin^OdQ^D!M zVRJWij@|`WqhS?a z{0@(Yxr}4}vt+6V(vpl+PPtox0q*x~rQ3(148_It8D=Zj$!TzBLwu2;hb>ksb+u~( zt(+ER=2R%ZrAM{4=3JO4|51`zHt6KiomWP96%%cn zW5wV6-ruNPFJ99aB$B9d#f9&V6+iDxi2?RVhIUYjG!Bt{~NoGrI@M2v&MAIhs3i@kF?@l7E z+!&C$S(FB4GZkn{3#hNzbHf#`1~L_=$+B-GPY>iOnz-6>AAX1glv0mzjQz*)yNf7s zk)-*txGso{+sne(s9FFd{luqkok1J&tG%2^`ceVWk5;H)Q$?e^3AdCFI#_8YFD;{! z10aUz%FRb*G){V!%uBohb`yG%U;ov2Pi_%)pE=3HQoQqPs3lf(!5{Aj|MC(${)OdQ z(L?}gZT$uP5@_bfs75Sk_c2+A@hzq1L$ZZ7V0Yu-Q@$mzRmJpkE1H1#Ro%3jNcup^yn2x+!m1{n6&2>~2O2hRX znUn|4Qqg`8)t8fvYY~6BZ&Or6+9fGPtGZQxyFH2$w{EOmqhGtVP1%P5sOS}gHaHbM z0G6nB#pUge$-{<1eQz3qu?9GpiC}$6q*pQ#7VCPJsqb@>>e0Y6T)m;-oBKmxhq1VU z?xDAQ?XVoR(2y~n*klmISH~`IMa!yV%?g>PE4-Y|y}&V(}N$V=4#^TwYml%v%|M-ti{_fB}d1)0%yL zf`!(+>^kvA(hdq%+ohhU2GkR<126g3kBUuN)xu>MZ%rG2~dfv>sGCoMB4<0Vtu|E!5Z9Xo{^q9iE#y;p3>Tjy@gAK&)Y|72Mo(O)s z!5oF;91nBfmT7rAtPQFZyH?eYLgRYGYi28Z25a_e>_+t5iVyc1Hs~@cT+R6lR(;<) zN%z|l6v~Jzd{m`cDmNdRPvuO%9Z4m^Zv)i=QSKMUya}I=D&YL2N!t(Ox_K*I9Q$@J zA%vTYC`|Y&Y)FrLD7Caqg*=n2_EA}NgA$2$EGo0{$Ud3|wZz9UDNf>f?fbtibXTFx9W0if_*5|EJIoE4vfQDMK;ioM1KNF+*`b7Xqa_jFTrR2S zCp*U9?x#ddCj_5~tt+fE5IjxXVzZAK4dI%A?#*wz{HUPizI+KPw%sCxQuUEk>HE}- z{JAdjRl?iCq?2sxGzCxZYXvLvQ&c=O`GS%lX9pZr(@l>^l>22?jb_%Alwh>_*)WFO z?~vtO)j&VR#g&IXlm%+eRQ-K#i9eOH(t+ZJxO(U@L`pDFymflBBw71X$u6|h##CbX z-KAPr@RBrjW_Ht(5d4BPAd9Z78`O8e8a`=V$?48rDo&>VYT|#w&9nXf%&-X7!e_At z?>sTX|2i{bY0ityKs7krYZ4`vY`AUL91V7O!pr%U@gktxPF|N~jC_88=P%0gO&RLm z?(n;O$n%uK_(;qcwscJo;gPrEkD~qZFr=6<&&l%1Jiv_eVUhJ;B|k_KG0&fKxIqjr zXSA%o;KzND1*Nd}Y$u{ildnnvCTdNb3HzY<+Y~#76om~P5kFa4K@N<()r36|eB(HF zfAnV%qEg>yb6xTA^;l)@OPw$(E7FAtw09L}N}AG3W?@HE7u^qF?n?^SVn(YR8M+4E zYxl0#tew79V8OK@HRJ1DQ;LMW;du=`gJ%cTrBeLaX`AMlnHq>^oxYD%{K}qb-xSn7w3 zQ24NpTF>YH$q%)YHUC-D!crD1MeehxS~kzSOVjG(EUOw%3~+Jb7_XWSxSKTyEJGhq z+8M8C%zY1%BQs1u#89f6#R?l9?d8i~jDOJ0`qh_uQT%ty?tI{nC<;3gQS=_|?(DWr zJLRDH{SSv#RFCP~;FDkPE}7}ydk{UvaDn}X-p!UubeHGp?~CH0QVzd*EPn2C?NA{A zO7wnXcLxZzYRtHGV8y?01I1eG(mp?*Cc!F=p-09GKRMjsMIn~r^&g$Q`pNKorr|yU zqD)P4j;H(Eq_hWj93LXsfgS=Chafa>#Q`=n2YE=eY{TNtyy$|U%3Jxf?w4zb;p6$G zYiY?oQvAfJi__n=ely+Dz5DfYe%Gh_k(9BzKB;5kGxA!{>M56@L{!*o#oy3NaXmp8 zAmw?>nH}l=M%J3!-+^K%1LzPyIBD{8G_FShTY(LAf!OUB?DDUoH%&lCHjm4Lp9#L% z)p8j8s{Ekj^Zl393su~?oo&g=eJM{=yD@{Ry-M4-k=4MngUv3WUY-ov>!0MA2*=8w zBpI^gz0kvT$Tmgm?>|G#{P^=iBfUhTE0;};RVMf@7lz!4Z)T2Mtc4Gs5#HcjPVP6e zs?kisQ5fVawxs_i=8~CMQvvgiyC;cO(yXi`XlrCmYb;N z-uoz_s24XUXZ}QN92j-XkE)w^`1&2XINxa&h@w}&MPWeB69od|mM4ln49GB1^u*V1 z(5r)h3_-6>eh&}<>f}U^)Sq`CYxX!U1VHKHmYu_2bx^bqfF9R%0yf9E7}w%V-^{;- zn&E<8kJ*s(Xcz+O*>h0k$cR%N?SG`=Z^{`#uP&>{U<>&dEPXUBsy*}z=#toVrpf&H zpB({;3dWIv+)iUtxMud@8u8KB`0aSb`F2J#Y)MV-3%)3N?)M9`c>&u^N5==G%}c-6 z%N*kSYY^?RH(r%IgZ|%g>R{h+_uQC#2&JvQ(K%h`ou%aOe!ZM1p>SYpVy_JvRm+{n zyku7@WT|I?9-Tp`H4{X(fPGf4jnHy?K{y2%wXsQ&YwAl+!$x;rw{}Yd?a3(hty>-w zWoOy)EUd)6OnV3}tw!Tv4v53B2|5uwG>K$FoW}^^Se6V`%hv=3&y;${F_n)cX zf%&huczt?67eON&7y<%XeZ7~IQZ*N8(JfQP9VP;jaViM6J~>ueY9j09$d}S;G~gVk zHu1Lj1suK}51WKfq33fqs&8$}r2-J}Y>i)#3!e$s#=q!;TxF|NnMY}pU$y6shCE;+ zyAruO+WOky+?mjem%s~3aT6};ohzr~7fv$i4q0o7YL#drziM__I9W4=GE6XMf;LD> zX8Wh+_K?S12m#MvHZnOo7U=5j$qu*H5%+1HIe6l3;3jSEvgW@(nNgl9 zJ5SljzBk0if0$|72&9fHL+o+*E% zb9a!nG#KV3E!hH+z+Epy!A5m^{K8(ivoouhr?S3VfWZcM8H9`6!V;AoA&+SZQ_if) zvxZ=EBi^VNfSCtPLaLAewqucw(C7p*_kHBCyJTFAXh2C(fI%bsj*zGDR*H=lHyB6S zw~IVBl8hS{3TPY#e8@?#p5|*y3%(IB8o$8pF!-v0&mX`U7XVi_PhwAorGc-mO2kKj z2Fi@b?ttq{Zjpf+g=Wc)xe0sB)N16%9t0uDxKNVZxhd$M00U+EW3b~|laL!;82?Bz zj&5~rvSb>F@A^f}fAx5Hn9MhUn`N#HJLS-hKqKi|Xh#f)?y26L=aVpe9p2ZP$@F5b z-QsZL;BlN@wCEY7rw$h6%6v@*Ry|wMT*O#3EIo~y*zt|Q`9&q!KC(6$+5vPHAtffi zYH23GkARhZS-U58K{iqPSGtQxrgFI%km&~GL&B1AM{TY|#~Nc5KCR%84b6Yll5q`| zaRs5Dgt(}usX0vl-c@v^eIXg={~h+;F~A^*!_!l~L(i~Ri5m}?)T^NL`P~rGTB`uMTE+l|fSUoN zW@IG=P4cay-+fNbw`;7K)bgTRc(I%Sd?W>U>i2JZD(x^VS@eO)z`Ro9wo1AV%%%_R zwmgqE=Yx$ia|_+#gdL7RMVFgzGKKfR(j8Q;jaNZt0Dlt`?5FkUI`LP;;{b&`^!MnK zKTn1nLW&Uik&Dux+KKpuA$j&+O+sA68j5x=jywqJgk)#d6|zn)iVd2m+Sl%Nz#*R% z*+{kBhwIxL)&T{bD%G(C8`+Wn@U|?0O_y`RG4T)?P%2B!(gTo@_(1%^LAZy~%9Mt5?QXr5CMcZ4={$y$o)h9 zc`<|`VJr7vLhH2GuMYBFzl<+7J1_h_ekKK;COTa4UME2D{`iF_HVp4e9qn z=4@E1mP97eWzVg7Mlj4S$5kdV$oK_UE8m0lv^}0GU$tqr-xs?W`en#v)vD92UPx!Z;qS7 z;ZY-)6iT3EkW*Lx)m z9t&eXwv#Qz`nz9a?I$FZhHQbR>$k+}ur{`!?V9pA${mLC2m1?Ur@#ruyil4zLHvm*B_a4%8oAhyk zlszUpvhQ(*HhrR9FknAqy&#%+?0H(>F~Zwvutlem8Zs0H%3y-`tpO%46DTs_avrOC+vvkV z|4=NPdiKlTY_v1$H1)L8WaCE}KBWM1GuKH!Il^q^>IrB@uuv`Xw7B$OEXGnLbj7WlZi~~u)UjZHk;|KaYEGe9B_J-|eRs`Cv zd0DZXd|j~|^mxahn?juFNe2k;*PvrM{#h2tR}g(M&)AU6o9|I!b=FK;0Q!yo7y&>o zbz)t5P-vbEZ5%JVab$sAU!%gGreCPMm>fuB_1=Aed7kfRD^3%cmAWVPMx4NoZ?k5C z6Ey!3wr0hE1^luLG?ndgX7Y0_7Pgw>F?l0CEM*p9P8coe*`_zW!+dO~ZC7pMQm?wH z`LAVCOuN{FLA{D)ssRb(Yc~~}@=YVR*tDPq08F#|!R%2R!kmrl46KD{W-c^ulhR6= zShbKDP zuG{YQ7H$)9<49ULJvBZc_`}`0Lo2mp{6Ov&CykG;2Xjq1cfrJdmM4BjIVG0{h`V0p zQKdzn0hgW&@fqT{E@8$te zv%r$uKg&{YJ#IsIAoz-8XU`*IlmU`BxPR^BpNF(In37TRG*^Y;2Hb=5R0k!&%4ZH2 z;@KwVx}SudS^MeT4@c& zv-MZ=AE*~A5!792h1Q7`)oCNl%TgzGZE(*p*OHvQH4wF=I==2HS&UevZ$4J6Yox+< z$%=!lR~81hI^6#~3>7(j1suIa=37DexNJW$V>Ys0fV}~9L`oU{a6$~M_St>>-}}|+ zn-2pGo}a#>ux6rbxqP~iWq#3T{KcjmWJuQEDQsn|EId&|G}SPIvLbs10jMl1xznf3; z0CHB|dA*Uc@aBI+G0B;-`HrG69IZ%QY&jX%V<(m)`DK|AR)*PNCv@?v=_u2%+D{(x z`uk590GbmdXerM?zg)c@vFE%VAcGVh|#iR&X$0q6z= zU@9QHC);ivXICqFs(O~|dG_xh1K@-e4lAQ{dVm~gGi`_VLxEIK*)8vHkpPyuw*>^c zRgDci#ru}0FU4D=BnaC*gc}-Rx_ob!5ZNfCs;qT(E$sMFO-H`mN)B=9pef;T~%Brx4f;HJbvkdCF9QQ{NuVsuU+QWOtw3% zNP-6gk2Zwz51ofm;db6WDa3Ow$NfvaEp)FEYS=u#1EQ{Ps7nM;bEFu`Ux(8V!*YOq z_8UCHUXqDbxCW}HY;#jhDANL!f`({sK3cDTvR?onY0bnvujy5w%n9s~cL#KGq-32Q z-SR*WTSpRbd%3pwwLwrJpq-Xh0ckAA|r;}n2uLWJPnC-O^qw&Qkpu}wMg zvHL(pOR90;aQp(MNyxf5D;g+3`r;Sb!knZ~{Cg5X34q4X8c=?h3wR^ybS{A$VhU0N=l2xV{X+(@mNQDx$XMF^nUtl@U!f|w7Z(&iTbLj-Y@yFa zMhB>2WzVugiE&cghbB-uPzyi;AQK?7nW4L!R&?igow(s`)6!ERwPhtV-t?Qan`%4A zmAv$3yBU0t!xTjGl>5;70ERfBDre~6IPIj~**iw&%%9r@_uI%+s zGCV!Eo6)4&Z3N{$`Iy`LEqtwd!V))CDLLNj1zP|dLZka{135s$5vADaa<_x;LD++9 zv)ZPyveZj9MY2{qVOMydm`E^p&}B!+Ro~Lk{CiYw)`e)UsCz644*X*Cz6LJ?0yGcf zM8>Qluh$zkvJ7KR4d?*zYzZuub^u^TID%n83wc`if`TgC2}Qe52vENRUUk20{ajw) zCQRkG5KZJ%1)AL=4dA11Bi?Ov-CMX~Q_il()}$fBmvnCTFb-Z(-+FvuLo?~~3@3o* zg)Ieqp51YHO)I5J6RAukU!SVS%bhrhd+HA*h5*xpLumU@F!Da@u|gmwuarCFb;r(% zMX0o6JHOyPP_#&6dz7p{NTL*$?yd|<0NMrNw;_O&O!3h06V0TQwr7MKXVxHIpy)M* zjHCbw!X|$RH#QPT<@cD4j2lMrRZs8@X*u^&3zFW~w@80K7`S@y7)YME(JkZBQ;@Yo zu}yWt9>8(JcI7}`A;R*{S=Zn0BklZZLvPIaNTw1=(LfY0LOBm)s3PBU8}=~${Xb?* z2FyslBjREcP7M?wahCBCe^CdkJyS+L3aR3a9wSds8&-(iwVZFU^k7CKhK}9PXB7?mycmmdI_qI0Mw+ z+eJ2>O0G`PP=rbTH*<1n#gNUS4T+)0>YKonKc2@2~JLx-O$0? z;7y!a|0<5wnhZ<*ml-kLWjO8Kp%u0X`Qzgk=J8pXzTy{qhcSu{e@11g+3JVZ zWqF8&;0F->R^1P^o)d&oqHVqjwR#?npQ z)#@z#h3L5Irg$YdMG%xCHP}UF>4RaF;S5yqeBeiLa|S5w@t*d@fh_fN%(zeW>ciMlqlcS)#WzOudvd_lXfTFJ{2o!pV*;AS4$7t zF8c&DQS&*orZ)Ze1q<{??(UEx9`v;|^Hz@2s~%Hl#eAm=gnn{smc0xWvNfvZsZ4(Y QT(AUbYwBy1sUsr(4?*lRH2?qr diff --git a/apptools/sunstone/public/js/user-plugins/apptools.js b/apptools/sunstone/public/js/user-plugins/apptools.js deleted file mode 100644 index a1e8b04991..0000000000 --- a/apptools/sunstone/public/js/user-plugins/apptools.js +++ /dev/null @@ -1,77 +0,0 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // -// // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // -// // -// Unless agreed to in writing, software distributed under the // -// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES // -// OR CONDITIONS OF ANY KIND, either express or implied. See the // -// License for the specific language governing permissions and // -// limitations under the License. // -//--------------------------------------------------------------------------// - -var apptools_dashboard_tmpl = '\ -\ -\ -\ -\ -
\ -\ - \ - \ - \ -
\ -
\ -

' + tr("AppTools") + '

\ -
\ -\ -

apptools logoAppTools is a group of tools for users and administrators of OpenNebula to simplify and optimize cloud application management. With AppTools you can configure the software stack in the applications, manage multi-tiered applications, and build your own private market to distribute applications across several OpenNebula instances.

\ -
\ -
\ -
\ -
\ -\ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
\ -
\ -

' + tr("AppEnv - A tool to manage environments") + '

\ -
\ -\ -

appenv logoAppEnv performs the automatic installation and configuration of the software stack that constitutes an application environment. With AppEnv you can easily define software configurations for your VMs and share them with other users.

\ -
\ -
\ -
\ -
\ -

' + tr("AppFlow - Service deployment") + '

\ -
\ -

appflow logoAppFlow enables the automatic execution of multi-tiered applications. With AppFlow you can define multi-tier applications composed of interconnected VMs and manage them as a single entity.

\ -
\ -
\ -
\ -
\ -

' + tr("AppMarket - Image repository") + '

\ -
\ -

appflow logoAppMarket builds a centralized catalog of cloud applications. With AppMarket you can build a private repository to share and distribute virtual appliances across OpenNebula instances.

\ -
\ -
\ -
\ -
'; - -var apptools_tab = { - title: 'AppTools', - content: apptools_dashboard_tmpl, -} - - -Sunstone.addMainTab('apptools_tab',apptools_tab); diff --git a/env/install.sh b/env/install.sh index 088e45b4a1..76ec8d1cf3 100755 --- a/env/install.sh +++ b/env/install.sh @@ -21,4 +21,5 @@ copy_files "lib/* cli/*" "$LIB_LOCATION/env" copy_files "bin/*" "$BIN_LOCATION" copy_files "share/packages/*" "$PACKAGES_LOCATION" copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins" +copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images" copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes" diff --git a/apptools/sunstone/public/images/appenv_icon.png b/env/sunstone/public/images/appenv_icon.png similarity index 100% rename from apptools/sunstone/public/images/appenv_icon.png rename to env/sunstone/public/images/appenv_icon.png diff --git a/flow/install.sh b/flow/install.sh index 6a0858ac7d..9bc1a3403c 100755 --- a/flow/install.sh +++ b/flow/install.sh @@ -44,8 +44,8 @@ copy_files "lib/* models.rb config.ru Gemfile Gemfile.lock \ Rakefile" "$LIB_LOCATION/flow" # Sunstone -copy_files "sunstone/public/js/user-plugins/*" \ - "$SUNSTONE_LOCATION/public/js/user-plugins" +copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins" +copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images" copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes" # Do not link the ETC files diff --git a/apptools/sunstone/public/images/appflow_icon.png b/flow/sunstone/public/images/appflow_icon.png similarity index 100% rename from apptools/sunstone/public/images/appflow_icon.png rename to flow/sunstone/public/images/appflow_icon.png diff --git a/market/install.sh b/market/install.sh index 4217f097f7..c1dcec144e 100755 --- a/market/install.sh +++ b/market/install.sh @@ -34,8 +34,8 @@ copy_files "lib/* models.rb config.ru Gemfile Gemfile.lock \ Rakefile config/init.rb" "$LIB_LOCATION/market" # Sunstone -copy_files "sunstone/public/js/user-plugins/*" \ - "$SUNSTONE_LOCATION/public/js/user-plugins" +copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins" +copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images" copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes" # Do not link the ETC files diff --git a/apptools/sunstone/public/images/appmarket_icon.png b/market/sunstone/public/images/appmarket_icon.png similarity index 100% rename from apptools/sunstone/public/images/appmarket_icon.png rename to market/sunstone/public/images/appmarket_icon.png From 55002b04ee3c34539aff2c0ce651e7572efc4061 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 24 Sep 2012 13:03:35 +0200 Subject: [PATCH 4/7] Add SHARE_LOCATION to install_lib.sh --- install_lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install_lib.sh b/install_lib.sh index 73986694da..b70098b038 100644 --- a/install_lib.sh +++ b/install_lib.sh @@ -49,12 +49,14 @@ if [ -z "$ROOT" ]; then LIB_LOCATION="/usr/lib/one/ruby/apptools" BIN_LOCATION="/usr/bin" PACKAGES_LOCATION="/usr/share/one/apptools" + SHARE_LOCATION="/usr/share/one/apptools" ETC_LOCATION="/etc/one" SUNSTONE_LOCATION="/usr/lib/one/sunstone" else LIB_LOCATION="$ROOT/lib/ruby/apptools" BIN_LOCATION="$ROOT/bin" PACKAGES_LOCATION="$ROOT/share/apptools" + SHARE_LOCATION="$ROOT/share/apptools" ETC_LOCATION="$ROOT/etc" SUNSTONE_LOCATION="$ROOT/lib/sunstone" fi From 92fca80d5262a6ccf52403101c6a0c17d4b7fd0e Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 24 Sep 2012 15:12:15 +0200 Subject: [PATCH 5/7] feature #1476: add -u and -g options to change user and group --- flow/install.sh | 2 ++ install_lib.sh | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/flow/install.sh b/flow/install.sh index 9bc1a3403c..9368bed704 100755 --- a/flow/install.sh +++ b/flow/install.sh @@ -52,3 +52,5 @@ copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes" LINK="no" copy_files "sunstone/etc/sunstone-appflow.conf" "$ETC_LOCATION" copy_files "config/appflow-server.conf" "$ETC_LOCATION" + +change_ownership $LOG_LOCATION diff --git a/install_lib.sh b/install_lib.sh index b70098b038..7b1946dd0b 100644 --- a/install_lib.sh +++ b/install_lib.sh @@ -15,7 +15,8 @@ usage() { echo - echo "Usage: install.sh [-d ONE_LOCATION] [-l] [-h]" + echo "Usage: install.sh [-u install_user] [-g install_group]" + echo " [-d ONE_LOCATION] [-l] [-h]" echo echo "-d: target installation directory, if not defined it'd be root. Must be" echo " an absolute path." @@ -23,7 +24,7 @@ usage() { echo "-h: prints this help" } -TEMP_OPT=`getopt -o hld: -n 'install.sh' -- "$@"` +TEMP_OPT=`getopt -o hlu:g:d: -n 'install.sh' -- "$@"` if [ $? != 0 ] ; then usage @@ -33,6 +34,8 @@ fi eval set -- "$TEMP_OPT" LINK="no" +ONEADMIN_USER=`id -u` +ONEADMIN_GROUP=`id -g` SRC_DIR=$PWD while true ; do @@ -40,6 +43,8 @@ while true ; do -h) usage; exit 0;; -d) ROOT="$2" ; shift 2 ;; -l) LINK="yes" ; shift ;; + -u) ONEADMIN_USER="$2" ; shift 2;; + -g) ONEADMIN_GROUP="$2"; shift 2;; --) shift ; break ;; *) usage; exit 1 ;; esac @@ -93,3 +98,9 @@ create_dirs() { done } +change_ownership() { + DIRS=$* + for d in $DIRS; do + chown -R $ONEADMIN_USER:$ONEADMIN_GROUP $DESTDIR$d + done +} From 296e1e9393f5740e74f0a8f45566908f18552bf4 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 24 Sep 2012 16:27:21 +0200 Subject: [PATCH 6/7] appflow: Use owner_id instead of uid for templates --- flow/client/bin/appflow-template | 6 +++--- flow/controllers/appflow-server.rb | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flow/client/bin/appflow-template b/flow/client/bin/appflow-template index 957981e738..5c3630faab 100755 --- a/flow/client/bin/appflow-template +++ b/flow/client/bin/appflow-template @@ -323,7 +323,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Service.perform_actions(args[0]) { |service_id| params = Hash.new - params['gid'] = args[1].to_i + params['group_id'] = args[1].to_i json_action = Service.build_json_action('chgrp', params) @@ -344,8 +344,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do Service.perform_actions(args[0]) { |service_id| params = Hash.new - params['uid'] = args[1] - params['gid'] = args[2] if args[2] + params['owner_id'] = args[1] + params['group_id'] = args[2] if args[2] json_action = Service.build_json_action('chown', params) diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index 4ea16b95d9..48d8c3b545 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -319,10 +319,10 @@ post '/service_template/:id/action' do body service.to_json when 'chown' - if opts && opts['uid'] + if opts && opts['owner_id'] args = Array.new - args << opts['uid'].to_i - args << (opts['gid'].to_i || -1) + args << opts['owner_id'].to_i + args << (opts['group_id'].to_i || -1) service_template.chown(*args) else @@ -330,8 +330,8 @@ post '/service_template/:id/action' do "You have to specify a UID") end when 'chgrp' - if opts && opts['gid'] - service_template.chown(-1, opts['gid'].to_i) + if opts && opts['group_id'] + service_template.chown(-1, opts['group_id'].to_i) else OpenNebula::Error.new("Action #{action['perform']}: " << "You have to specify a GID") From 4ca6e5a09bf5f1cc0dc8b8b93ad1a16ad46f6084 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 24 Sep 2012 16:47:54 +0200 Subject: [PATCH 7/7] appflow: Fix integer validation and use vm_template instead of template in create template (sunstone) --- flow/lib/validator.rb | 10 ++++------ .../js/user-plugins/apptools.appflow.templates.js | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flow/lib/validator.rb b/flow/lib/validator.rb index 88cd48a916..15f775b0d0 100644 --- a/flow/lib/validator.rb +++ b/flow/lib/validator.rb @@ -243,12 +243,10 @@ class Validator # # def validate_integer(body, schema_array, schema_key) - if body.is_a?(Integer) - body - else - raise ParseException, "KEY: '#{schema_key}' must be an Integer;"\ - " SCHEMA: #{schema_array}" - end + Integer(body) + rescue ArgumentError + raise ParseException, "KEY: '#{schema_key}' must be an Integer;"\ + " SCHEMA: #{schema_array}" end # Validate an null type diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js index 3d75377666..775a9ab204 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js @@ -643,7 +643,7 @@ function setupCreateServiceTemplateDialog(){ var role = { name : name, cardinality: cardinality, - template: template, + vm_template: template, parents: parents }; @@ -663,7 +663,7 @@ function setupCreateServiceTemplateDialog(){ $('input[name="cardinality"]', context).val("1"); //unselect selected parents $('select[name="parents"] option[clicked="clicked"]').trigger('click'); - } + } else notifyError(tr("There is already a role with this name!"));