From af925211af5f949485148e50c561ab68b3b1e277 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Wed, 20 Oct 2010 11:46:57 -0700
Subject: [PATCH 01/15] Change in Network tab UI in Resource

---
 ui/new/css/main.css            |  44 +++++++++++++++++++++++++++------
 ui/new/images/vlan_barbg.gif   | Bin 379 -> 375 bytes
 ui/new/images/vlan_connect.gif | Bin 1450 -> 1467 bytes
 ui/new/jsp/resource.jsp        |   4 +++
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index 6d1875d42f7..05a73d28dc9 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -42,7 +42,7 @@ a:link, a:visited {
 	
 }
 
-a:visited {
+a:hover {
 	text-decoration:underline;
 }
 
@@ -3324,7 +3324,7 @@ a:hover.search_button {
 	border:1px solid #999;
 	position:absolute;
 	top:5px;
-	left:8px;
+	left:20px;
 	margin:0;
 	padding:0 0 10px 0;
 }
@@ -3338,6 +3338,34 @@ a:hover.search_button {
 	padding:0;
 }
 
+.networkswitch_infodropdown_actionbox {
+	width:192px;
+	height:auto;
+	float:left;
+	margin:5px 0 0 0;
+	display:inline;
+	padding:0;
+}
+
+.networkswitch_infodropdown_actionbox a {
+	float:right;
+	color:#2c8bbc;
+	font-size:10px;
+	font-weight:normal;
+	text-align:left;
+	margin:0 7px 0 0;
+	padding:0;
+	text-decoration:none;
+}
+
+.networkswitch_infodropdown_actionbox a:link, .networkswitch_infodropdown_actionbox a:visited {
+	text-decoration:none;
+	
+}
+
+.networkswitch_infodropdown_actionbox a:hover {
+	text-decoration:underline;
+}
 .networkswitch_infodropdown_textbox li{
 	width:180px;
 	height:auto;
@@ -3365,7 +3393,7 @@ a:hover.search_button {
 	height:15px;
 	float:left;
 	background:url(../images/networkswitch_infoicon.gif) no-repeat top left;
-	margin:-12px 0 0 20px;
+	margin:-12px 0 0 10px;
 	display:inline;
 	padding:0;
 	cursor:pointer;
@@ -3431,7 +3459,7 @@ a:hover.search_button {
 	width:45px;
 	height:21px;
 	float:left;
-	margin:-22px 0 0 38px;
+	margin:-22px 0 0 29px;
 	padding:0;
 }
 
@@ -3447,15 +3475,15 @@ a:hover.search_button {
 	width:12px;
 	height:12px;
 	float:left;
-	background:url(../images/search_closeicon.gif) no-repeat top left;
-	margin:-22px 0 0 10px;
+	background:url(../images/search_closeicon_hover.gif) no-repeat top left;
+	margin:0 0 0 0;
 	padding:0;
 	cursor:hand;
 	cursor:pointer;
 }
 
-.networkswitch_closeicon{
-	background:url(../images/search_closeicon_hover.gif) no-repeat top left;
+.networkswitch_closeicon:hover{
+	background:url(../images/search_closeicon.gif) no-repeat top left;
 }
 
 
diff --git a/ui/new/images/vlan_barbg.gif b/ui/new/images/vlan_barbg.gif
index c1a6ea19cb74ac82a59934e265e6f0bab7200cb3..2e2e0ac27b0cb0039220c317a3fffbafae19ecfe 100644
GIT binary patch
delta 342
zcmV-c0jd7`0`~$;M@dFFIbq-d3;@Ic0RR90%F4>d#>T_L!^p_Uy}iA~#l^|V$-BF|
zzP`S=xVVUjh?<(3l9H0a!NGfbd%(cJadC0S$H&6L!oR=2kxw3xY7l?m0So{D1@vGA
zjAUt^XsWJk>%MR-&vb3yc&_h!@1KES@Ia6V41)<IQ3xmy1&U)}5D*T+ETge_L`1)^
zcuX#v&*-#z{mKT2Mx>JIgi5JatUIvne%XM5f`f#GhKD?Ea7Rf?O;1r%Rabj_TwaKo
znwy-Ro}WNji*k;2k$8TTdwpJDpsug5v9hx!ibafbk9LxIm8*ZW!NSAD#Xh!ijdYNA
zlX`Byt;W;T)z-quxTVazsnC}Z*W%;k<%HR!%e$!0THw;=@$&QZGU&>>r_R3b_5S|=
o>)p#`s#z~p{Q@dn$dK5;ZR_?S^wY4S#fzODs?&Gyo1YK>JMgr?CjbBd

delta 353
zcmV-n0iOQ%0{a3|M@dFFIboy$3;@Ic0RR90%F4>a!^6hL#>vUa#l^+Fy}iiD$cTuD
z$H&LGxVV~{n!&-rySuw_adE!BzQV%7l9H1B{r!7;d%wTGz`($Bb90eV8<A}df208n
z000H}paqO%X`X1Ru59bRa4gSsZQppV@BAnQKp^3e7!(AM%EJ&)Gz=7mpfETPg4jg_
zF>#1`;IMd1E}PHjbnJ&67LUng^BJ91uUMd#>s9;zfPsR8gnn#6ZbnE-OioZzR91O<
zTU~{hn3<ZJoMMMUM2c~ZbdYzGe*t@4U!AS4uduOdp8<(*jB}56l9Q@^vcSQ@!^9=D
zwu^F(b&+^^zO2R4)6~^y$Dy~%rMu2ql@8Y8<K*RQdB~%=%%{EJ(dO~;^TpV2$)vi?
zsL=HO{{TDL6NPJ;DPGUs1zgCmVVZ&3^07nsjgP~N7&GF4h;Q9NZ$W&80{{R!5<tOT

diff --git a/ui/new/images/vlan_connect.gif b/ui/new/images/vlan_connect.gif
index 6643983aedc5558f8afd701372eb505cfc3eda19..8156fcd1add11514592320c03a671f3fb009cf7e 100644
GIT binary patch
delta 667
zcmV;M0%ZNF3%d&kM@dFFIbqPT2NMGU(32YjA%7S%T5Lo{*D5doYH1uP(E@>!ClMHc
zaG*ef2ox?zAdmrrgb5B36gXf20m`2b6f|J4fTYo*NRujE%CxD|iBHVH`myWPtuUFM
zJbIec<WH3>UBZ+}(<V-xJbnH=8FXk-u5jbZolCc_-GXvdEkboj5~VeFF?vM_w&ly1
zGk<H|%(=7YTDC%o3dBN1Nfti50&CvPxwGe`P@oV=C4>_mQULCJZb;d(7h8l^8iqOM
zOe{>3%A9Sic5Pe9SA4`su_8yQN~@DAU(S59novVRM5^OTPoE*9ni~v0ym%W^DP@cQ
zZFQ-8jyQf8r+rM|cTqMidfbp<<3y4G_<!^3-_O6l|Nj66DByqu7HHss2qviDf($n3
z;DZ3Z@k0n71OmwsAAIpa2oQESpcC=USKod9fhZq+C(NOqV~@E9z$_Y=umK4r?68FZ
zIOeG1jy(40<BvcFDddnu7HQ;>NG7S|l1w(~<dZ-mG6)B<2*H6AQgq=62T*o7q<<AL
z&RFA(K7uJDjXUhIVsAi2R+Jk$!0>_yILuJQ0C?u9=bn7_>F1w-1}f;FgcfS(p@=4`
z=%S1^>gc0@it+~#9sp8>2Oa=Xg(8r4Iw%uy&ROT3eu63|oinhqCVMW5p+XHK@R)#t
z3r%=v>#exvs_U-2_UbEuM;K8-1%F1IGAt2>;PR`7Q@k4MthM^rEUdD+K+CEvx(UD%
zNU%Ty2ptg8iFV|cYwo$|BE_w@;BLZ5cwxOH2q^4!U`H<4`lc-aT0{{97ii>>?!W{W
zY%sz72Js0TX~Y&UOqy6yh$nO;vfFyux^?iz9Cz&TYJ<T$8)9WGh8BzZx&##v06Pq{
BEf@d*

delta 649
zcmV;40(Sko3#tnTM@dFFIboEs2NMGUl#?3+A%6}Vk<qmZ41ih~Lr%0npkzq|1|S?L
zkRSqu3la!qz#w6Qg9HT*7(igM=K}=|7%UJ;w5ZXeNRujE8u5u4SU+~Xx)mnVlSfRG
zlI)36B}<nuWzw{XQzy@!C4UATnzgOlw{YXieJDrOB2<SYQCc%M<W`eiSGIf^b7sw(
zIe&MeO$$^g04!9LWZ}cBujR{_Giw$I1qzW=LO9_e1>nwRhma+Eu?0A#V3%Xg#KJVG
z4B5nI(W(`C#Yc=3D{_>obh^0l<H#MV2{j}{q&lwj^cgZL`N7`5gSRnt()HI?m$K*o
zh~o#b*~J8QFJRN6#|;@aP9zCHzrOwZ_<!^3-_O6l|Nj66DByqu7HHss2qswH8$X2b
zK_HME@xd1#grMMs06Nj$d-2VupN8(icfuUzDYlq;vuI$#1|*cQ!xjR>DC3MY)@b96
zIOeG1jy(40<BvcFDddnu7HOo6hz!DkEJAP~g%n*l!oiVL_GpEQEV>BejaRPN;(rc%
zl$e`OjV<7Y4lukR0uD12F~FN}#wq8Vbk=F-op|P{=bn7_>F1w-1}f;Fgu*GxA3%5j
zNEIG<07Mmv6e{VSOrWVIn{L)wX_{-!z>1jYsV9aCHH^Rm3NAE(;i{~*>gubo#)m5F
zen%KlK?O#faw`#r;4&+#Q;=#Zs&cC87i_7gx<Cu4CziPc5-iXFLI;F&V%@daW~=SB
z&qh1#CX96FRZD_^;%x_Z<if0OWdfi@6hUx-MjqSNYwx}IGWBi{pTLnuYva14i6w=2
jLPsLEo!9JI`8MqE!w^&Sm$<JHCe~qPnaJ*10RaFz#7iyr

diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 72578a0d81f..13ee11c17f2 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -982,10 +982,14 @@
 <!-- Direct VLAN Template (begin) -->
 <div class="networkswitch_vlanpanel" id="direct_vlan_template" style="display: none;">
     <div class="networkswitch_vlanconnect">
+    	<div class="networkswitch_closeicon"></div>
         <div class="networkswitch_vlan_infoicon">
         	
         </div>
         <div class="networkswitch_infodropdown" style="display:none;">
+        	<div class="networkswitch_infodropdown_actionbox">
+            	<a href="#">Close</a>
+            </div>
         	<ul class="networkswitch_infodropdown_textbox">
             	<li><div class="networkswitch_infodropdown_textbox_label">Zone</div>: NC </li>
                 <li><div class="networkswitch_infodropdown_textbox_label">Network Type</div>: Root</li>

From afcf6c136003235f488e16491a4fd657e3800c72 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 11:51:14 -0700
Subject: [PATCH 02/15] new UI - resources page - fix a bug that clicking on
 zone/pod/systemVM node will close system menu.

---
 ui/new/scripts/cloud.core2.resource.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 605dcb00df5..077cbb4d80d 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -74,7 +74,7 @@ function buildZoneTree() {
 				
 				
 			case "zone_name":	
-			    selectLeftMenu(target.parent().parent().parent());						    
+			    selectTreeNodeInLeftMenu(target.parent().parent().parent());						    
 			    var jsonObj = target.data("jsonObj");  
 			    showPage($("#zone_page"), jsonObj);
 			    hideMiddleMenu();
@@ -82,7 +82,7 @@ function buildZoneTree() {
 			    break;		
 			    	
 			case "pod_name" :	
-			    selectLeftMenu(target.parent().parent().parent());
+			    selectTreeNodeInLeftMenu(target.parent().parent().parent());
 			    var jsonObj = target.data("jsonObj");
 			    showPage($("#pod_page"), jsonObj);	
 			    hideMiddleMenu();	
@@ -90,7 +90,7 @@ function buildZoneTree() {
 				break;		
 				    
 			case "cluster_name" :	
-			    selectLeftMenu(target.parent().parent().parent());			    
+			    selectTreeNodeInLeftMenu(target.parent().parent().parent());			    
 			    var jsonObj = target.data("jsonObj");
 			    showPage($("#cluster_page"), jsonObj);
 			    showMiddleMenu();
@@ -102,7 +102,7 @@ function buildZoneTree() {
 	    		break;								
 						
 			case "systemvm_name" :		
-			    selectLeftMenu(target.parent().parent().parent());		
+			    selectTreeNodeInLeftMenu(target.parent().parent().parent());		
 			    var jsonObj = target.data("jsonObj");	
 			    showPage($("#systemvm_page"), jsonObj);		
 			    hideMiddleMenu();			
@@ -117,6 +117,13 @@ function buildZoneTree() {
 	//***** build zone tree (end) *************************************************************************************************       
 }    
 
+function selectTreeNodeInLeftMenu($menuToSelect, expandable) {	
+	if($selectedLeftMenu != null)
+		$selectedLeftMenu.removeClass("selected");  
+	$menuToSelect.addClass("selected");
+	$selectedLeftMenu = $menuToSelect; 	
+}
+
 function zoneJSONToTreeNode(json, $zoneNode) {
     var zoneid = json.id;
     $zoneNode.attr("id", "zone_" + zoneid);  

From 4cca3f9b87a4010f9294e16cf77a436e4eeed878 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 20 Oct 2010 13:52:50 -0700
Subject: [PATCH 03/15]   when get scsi_id, replace all whitespaces by
 underscores

---
 scripts/vm/hypervisor/xenserver/vmops | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 4bffbef164f..da92f3bf5d0 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -1,3 +1,6 @@
+
+
+
 #!/usr/bin/python
 #
 # A plugin for executing script needed by vmops cloud 
@@ -394,7 +397,7 @@ def checkIscsi(session, args):
             rdevpath = rdevpath.replace(".", "")
             rdevpath = rdevpath.replace("/", "")
             rdevpath = "/block/" + rdevpath
-            cmd = ["scsi_id", "-g", "-s", rdevpath ]
+            cmd = ["scsi_id", "-g", "-u", "-s", rdevpath ]
             txt = util.pread2(cmd)
             txt = txt.replace("\n", "")
             if scsiid == txt:

From 41fb27d2461844567faa45adb5e99d2d0e6054ee Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 14:51:07 -0700
Subject: [PATCH 04/15] new UI - show middle menu when clicking pod node in
 left menu.

---
 ui/new/scripts/cloud.core2.resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 077cbb4d80d..2756ada73d5 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -85,7 +85,7 @@ function buildZoneTree() {
 			    selectTreeNodeInLeftMenu(target.parent().parent().parent());
 			    var jsonObj = target.data("jsonObj");
 			    showPage($("#pod_page"), jsonObj);	
-			    hideMiddleMenu();	
+			    showMiddleMenu();	
 			    podJsonToDetailsTab(jsonObj);				
 				break;		
 				    

From 8c169c2d302c04fa692923a68c97ba2fdb493c0c Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Wed, 20 Oct 2010 15:20:27 -0700
Subject: [PATCH 05/15] change in Domain left menu

---
 ui/new/index.jsp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index e38b563bf7e..f94cddcdaac 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -783,18 +783,18 @@ long milliseconds = new Date().getTime();
     <!-- SystemVM Template (end) -->    
     <!-- domain tree node template (begin) -->
     <div id="domain_tree_node_template" style="display:none">    	
-        <div class="leftmenu_domainindent" style="margin-left: 30px;">            
+                
             <div id="domain_title_container" class="leftmenu_content">
-	            <div class="tree_levels">
+	            <div class="leftmenu_domainindent">   
 	                <div class="leftmenu_arrows expanded_close" id="domain_expand_icon">
 	                </div>
-	                <div id="domain_name" class="tree_links">
-	                    Domain Name</div>
-	            </div>
+	                <span id="domain_name">
+	                    Domain Name</span>
+	          	</div>
             </div>                        
-            <div id="domain_children_container" style="display: none">
+            <div id="domain_children_container" style="display: none; margin-left:30px;">
             </div>
-        </div>
+   
     </div>
     <!-- domain tree node template (end) -->    
     <!-- ***** templates (end) *************************************************************************************************-->

From 258214f190b5cd745e5c5886e8f6f01a688b5ca1 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Wed, 20 Oct 2010 15:34:51 -0700
Subject: [PATCH 06/15] Left menu first level open arrow changed

---
 ui/new/css/main.css                      |   8 ++++----
 ui/new/images/leftmenu_maindownarrow.png | Bin 0 -> 588 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 ui/new/images/leftmenu_maindownarrow.png

diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index 05a73d28dc9..c773017fcdb 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -1479,11 +1479,11 @@ a:hover {
 }
 
 .leftmenu_arrows_firstlevel_open {
-	width:9px;
-	height:9px;
+	width:14px;
+	height:12px;
 	float:right;
-	margin:2px 4px 0 0;
-	background:url(../images/leftmenu_openarrow.png) no-repeat top left;
+	margin:0 4px 0 0;
+	background:url(../images/leftmenu_maindownarrow.png) no-repeat top left;
 	padding:0;
 }
 
diff --git a/ui/new/images/leftmenu_maindownarrow.png b/ui/new/images/leftmenu_maindownarrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..328ea8abeeca224865256c87e7ebfa9286136c2e
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000gE000aK1^@s7C5OCB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?ny*JRCwBA%xj&(#=yYvlL<sb`?@dy
z1P~)o<Uf$Jit*&78~?xm_`v`WKwuFaC0T~|A3rg8J6SUT1Q1Bz2~deN5Hm1dz5U?-
zmc54=Ty4!6m_B~~%3!Fg$?)UnZw7z>0xA1il@`gx00xXe{2$Ev`}aQs3y|ize(x~@
zGZPa-W!F>&Gkt9aKUX`3zkmLMB|DgynJaj?xfrIkR51Me_mAQCpFa#IFI{H<2q2KL
zEkFg;45;8A5OXp<diL@^8!HO~I%u1<{13~gFW(p#85tQs&IJKBHdY2V8*>noh3Vzn
z_Y7~|e+0Ubkzv!`BMe45nhY<1VqjS|R#pZU78V94Yf}bQB{`r@HU=i3gFt}k(ye<8
zAUi>V%JQ;cHZwCbNNyHDfPq}wWo4*cYG<Oyz{kVIfDiot|DR#w-eU}>F5j39@<OSx
zmMX*7Z{HcdegA=169|~=se?48g8lvls0rj#5dQM@8_>r`82<eG3)kdeZp0uhAqLhA
zGXRtX7(fvS3Z~CrzXPL;iNV*^p5f)|cMP|HQRU@e!@$qS2bB8;R`=o4S4ijp@oS(V
zqM-0(0>&p818puyj)FuD$QED}{sm%Yrhg2-e*Fdse*<ZhS-<y4JCFvclwiOQKvBE}
ah(iInwY@v<=c@bw0000<MNUMnLSTZ!f%;Pb

literal 0
HcmV?d00001


From 44f6264ce0a534cd4ee71c9a1d294c724c6fcaa2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 16:20:17 -0700
Subject: [PATCH 07/15] new UI - fix a bug that domain tree doesn't show
 2nd-level or lower level.

---
 ui/new/scripts/cloud.core2.domain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index 854c508c129..b24732a788e 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -74,7 +74,7 @@ function afterLoadDomainJSP() {
 			    if (domains != null && domains.length > 0) {					    
 				    for (var i = 0; i < domains.length; i++) {						    
 					    drawNode(domains[i], level, container);	
-					    if(domains[i].haschild=="true")
+					    if(domains[i].haschild == true)
 			                drawTree(domains[i].id, (level+1), $("#domain_children_container_"+domains[i].id));				   
 				    }
 			    }				

From e9b81c9b1e230d55ab00da8e167d1171d1bee602 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 16:45:40 -0700
Subject: [PATCH 08/15] new UI - resources page - populate host and primary
 storage into middle menu when pod node is clicked (just like when cluster
 node is clicked).

---
 ui/new/scripts/cloud.core2.resource.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 2756ada73d5..88b3336b3cf 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -87,7 +87,12 @@ function buildZoneTree() {
 			    showPage($("#pod_page"), jsonObj);	
 			    showMiddleMenu();	
 			    podJsonToDetailsTab(jsonObj);				
-				break;		
+								
+				var podId = jsonObj.id;
+			    $("#midmenu_container").empty();
+			    listMidMenuItems2(("listHosts&type=Routing&podid="+podId), "listhostsresponse", "host", hostToMidmenu, hostToRigntPanel, hostGetMidmenuId, true); 					
+				listMidMenuItems2(("listStoragePools&podid="+podId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRigntPanel, primarystorageGetMidmenuId, false); 					
+	    		break;		
 				    
 			case "cluster_name" :	
 			    selectTreeNodeInLeftMenu(target.parent().parent().parent());			    
@@ -95,9 +100,10 @@ function buildZoneTree() {
 			    showPage($("#cluster_page"), jsonObj);
 			    showMiddleMenu();
 			    clusterJsonToDetailsTab(jsonObj);
+			    
 			    var clusterId = jsonObj.id;
 			    $("#midmenu_container").empty();
-			    listMidMenuItems2(("listHosts&clusterid="+clusterId), "listhostsresponse", "host", hostToMidmenu, hostToRigntPanel, hostGetMidmenuId, true); 					
+			    listMidMenuItems2(("listHosts&type=Routing&clusterid="+clusterId), "listhostsresponse", "host", hostToMidmenu, hostToRigntPanel, hostGetMidmenuId, true); 					
 				listMidMenuItems2(("listStoragePools&clusterid="+clusterId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRigntPanel, primarystorageGetMidmenuId, false); 					
 	    		break;								
 						

From d01d2c01f46fe29c3af34801dfcfb1fba89a7170 Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Wed, 20 Oct 2010 10:44:09 -0700
Subject: [PATCH 09/15] fix a problem listing load balancer rules, the ip
 address for a vm has been standardized to ipaddress rather than a mix of
 ipaddress/privateip

---
 ui/scripts/cloud.core.network.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 610c56e4c65..fd95e5b9909 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -945,7 +945,7 @@ function showNetworkingTab(p_domainId, p_account) {
 				    for (var i = 0; i < instances.length; i++) {
 				        var vmName = getVmName(instances[i].name, instances[i].displayname);
 					    html = $("<option value='" + instances[i].id + "'>" + vmName + "</option>")
-					    html.data("vmPrivateIp", instances[i].privateip).data("vmName", vmName);
+					    html.data("vmPrivateIp", instances[i].ipaddress).data("vmName", vmName);
 					    vmSelect.append(html); 
 				    }
 			    } else {
@@ -989,8 +989,8 @@ function showNetworkingTab(p_domainId, p_account) {
 	   data: createURL("command=createLoadBalancerRule&response=json"+array1.join("")),
 			dataType: "json",
 			success: function(json) {					    	    
-				var items = json.createloadbalancerruleresponse.loadbalancerrule;						
-	            loadBalancerJsonToTemplate(items[0],template);
+				var items = json.createloadbalancerruleresponse;					
+	            loadBalancerJsonToTemplate(items,template);
 	            loadingImg.hide(); 	   
 	            rowContainer.show();	
 	            refreshCreateLoadBalancerRow();	            	

From 2f8aad26914ad3526e108d0234868bfff214f0aa Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Wed, 20 Oct 2010 16:45:02 -0700
Subject: [PATCH 10/15] The listSnapshots API has changed in 2.2 a bit, so
 rather than merge my fix for bug 6680 from 2.1.x, just applied it
 manually...the fix was to apply the domain search to listSnapshots so that
 domain admins can see snapshots in their domain and all sub domains, but
 nothing outside their domain hierarchy.

---
 .../cloud/server/ManagementServerImpl.java    | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 9ab36f851b9..92f124b5c16 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -5115,27 +5115,46 @@ public class ManagementServerImpl implements ManagementServer {
             accountId = account.getId();
         }
 
-        Filter searchFilter = new Filter(SnapshotVO.class, "created", false, cmd.getStartIndex(), cmd.getPageSizeVal());
-        SearchCriteria<SnapshotVO> sc = _snapshotDao.createSearchCriteria();
-
         Object name = cmd.getSnapshotName();
         Object id = cmd.getId();
         Object keyword = cmd.getKeyword();
         Object snapshotTypeStr = cmd.getSnapshotType();
         String interval = cmd.getIntervalType();
 
-        sc.addAnd("status", SearchCriteria.Op.EQ, Snapshot.Status.BackedUp);
+        Filter searchFilter = new Filter(SnapshotVO.class, "created", false, cmd.getStartIndex(), cmd.getPageSizeVal());
+        SearchBuilder<SnapshotVO> sb = _snapshotDao.createSearchBuilder();
+        sb.and("status", sb.entity().getStatus(), SearchCriteria.Op.EQ);
+        sb.and("volumeId", sb.entity().getVolumeId(), SearchCriteria.Op.EQ);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ);
+        sb.and("snapshotTypeEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.EQ);
+        sb.and("snapshotTypeNEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.NEQ);
+
+        if ((accountId == null) && (domainId != null)) {
+            // if accountId isn't specified, we can do a domain match for the admin case
+            SearchBuilder<AccountVO> accountSearch = _accountDao.createSearchBuilder();
+            sb.join("accountSearch", accountSearch, sb.entity().getAccountId(), accountSearch.entity().getId(), JoinType.INNER);
+
+            SearchBuilder<DomainVO> domainSearch = _domainDao.createSearchBuilder();
+            domainSearch.and("path", domainSearch.entity().getPath(), SearchCriteria.Op.LIKE);
+            accountSearch.join("domainSearch", domainSearch, accountSearch.entity().getDomainId(), domainSearch.entity().getId(), JoinType.INNER);
+        }
+
+        SearchCriteria<SnapshotVO> sc = sb.create();
+
+        sc.setParameters("status", Snapshot.Status.BackedUp);
 
         if (volumeId != null) {
-            sc.addAnd("volumeId", SearchCriteria.Op.EQ, volumeId);
+            sc.setParameters("volumeId", volumeId);
         }
-        
+
         if (name != null) {
-            sc.addAnd("name", SearchCriteria.Op.LIKE, "%" + name + "%");
+            sc.setParameters("name", "%" + name + "%");
         }
 
         if (id != null) {
-            sc.addAnd("id", SearchCriteria.Op.EQ, id);
+            sc.setParameters("id", SearchCriteria.Op.EQ, id);
         }
 
         if (keyword != null) {
@@ -5144,9 +5163,13 @@ public class ManagementServerImpl implements ManagementServer {
             
             sc.addAnd("name", SearchCriteria.Op.SC, ssc);
         }
-        
+
         if (accountId != null) {
-            sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
+            sc.setParameters("accountId", accountId);
+        } else if (domainId != null) {
+            DomainVO domain = _domainDao.findById((Long)domainId);
+            SearchCriteria joinSearch = sc.getJoin("accountSearch");
+            joinSearch.setJoinParameters("domainSearch", "path", domain.getPath() + "%");
         }
 
         if (snapshotTypeStr != null) {
@@ -5154,10 +5177,10 @@ public class ManagementServerImpl implements ManagementServer {
             if (snapshotType == null) {
                 throw new InvalidParameterValueException("Unsupported snapshot type " + snapshotTypeStr);
             }
-            sc.addAnd("snapshotType", SearchCriteria.Op.EQ, snapshotType.ordinal());
+            sc.setParameters("snapshotTypeEQ", snapshotType.ordinal());
         } else {
             // Show only MANUAL and RECURRING snapshot types
-            sc.addAnd("snapshotType", SearchCriteria.Op.NEQ, Snapshot.SnapshotType.TEMPLATE.ordinal());
+            sc.setParameters("snapshotTypeNEQ", Snapshot.SnapshotType.TEMPLATE.ordinal());
         }
         
         return _snapshotDao.search(sc, searchFilter);

From f964470ba4ecf9e8f09d5babad21f67d77f7519d Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Wed, 20 Oct 2010 16:48:04 -0700
Subject: [PATCH 11/15] remove whitespace at the start of the file which
 confuses the interpreter and prevents plugins from working

---
 scripts/vm/hypervisor/xenserver/vmops | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index da92f3bf5d0..2c45006d2f7 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -1,6 +1,3 @@
-
-
-
 #!/usr/bin/python
 #
 # A plugin for executing script needed by vmops cloud 

From 4399a051dd45aec11f73ba1b069f2750fd6c4b88 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 16:55:35 -0700
Subject: [PATCH 12/15] new UI - domain tree - calculate indent by treenode
 level.

---
 ui/new/index.jsp                     |  4 ++--
 ui/new/scripts/cloud.core2.domain.js | 22 +++-------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index f94cddcdaac..ce3344a4fb3 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -785,14 +785,14 @@ long milliseconds = new Date().getTime();
     <div id="domain_tree_node_template" style="display:none">    	
                 
             <div id="domain_title_container" class="leftmenu_content">
-	            <div class="leftmenu_domainindent">   
+	            <div class="leftmenu_domainindent" id="domain_indent">   
 	                <div class="leftmenu_arrows expanded_close" id="domain_expand_icon">
 	                </div>
 	                <span id="domain_name">
 	                    Domain Name</span>
 	          	</div>
             </div>                        
-            <div id="domain_children_container" style="display: none; margin-left:30px;">
+            <div id="domain_children_container" style="display: none">
             </div>
    
     </div>
diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index b24732a788e..36526713b2a 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -20,24 +20,7 @@
 
 var $selectedDomainTreeNode;
 
-function afterLoadDomainJSP() {   
-    //testing code
-    /* 	
-	$("#leftmenu_domain_tree").empty();		
-	var $newNode01 = $("#domain_tree_node_template").clone();
-	$newNode01.find("#domain_name").text("01")
-	var $newNode02 = $("#domain_tree_node_template").clone();
-	$newNode02.find("#domain_name").text("02")
-	var $newNode03 = $("#domain_tree_node_template").clone();		
-	$newNode03.find("#domain_name").text("03");
-	$("#leftmenu_domain_tree").append($newNode01.show());		
-	$newNode01.find("#domain_children_container").append($newNode02.show());
-	$newNode01.find("#domain_children_container").show();		
-	$newNode02.find("#domain_children_container").append($newNode03.show());
-	$newNode02.find("#domain_children_container").show();
-	*/			
-
-
+function afterLoadDomainJSP() { 
     var defaultRootDomainId = g_domainid;
     var defaultRootLevel = 0;	   
     var childParentMap = {};  //map childDomainId to parentDomainId
@@ -53,7 +36,8 @@ function afterLoadDomainJSP() {
             childParentMap[json.id] = json.parentdomainid;	//map childDomainId to parentDomainId   
         domainIdNameMap[json.id] = json.name;               //map domainId to domainName
     
-        var template = $treenodeTemplate.clone(true);	            
+        var template = $treenodeTemplate.clone(true);	  
+        template.find("#domain_indent").css("marginLeft", (30*level));           
         template.attr("id", "domain_"+json.id);	         
         template.data("jsonObj", json).data("domainLevel", level); 	      
         template.find("#domain_title_container").attr("id", "domain_title_container_"+json.id); 	        

From f4e21787b6c38997c8cd6952d93c8ae455521df8 Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Wed, 20 Oct 2010 17:27:03 -0700
Subject: [PATCH 13/15] bug 6658:  fix managing load balancer instances by
 removing some of the 'pending' status code.

status 6658: resolved fixed
---
 .../src/com/cloud/network/NetworkManagerImpl.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 75d3cca01dd..d4e89e7f60e 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -961,6 +961,7 @@ public class NetworkManagerImpl implements NetworkManager {
             instanceIds.add(instanceIdParam);
         }
 
+        // FIXME:  We should probably lock the load balancer here to prevent multiple updates...
         LoadBalancerVO loadBalancer = _loadBalancerDao.findById(loadBalancerId);
         if (loadBalancer == null) {
         	throw new InvalidParameterValueException("Failed to assign to load balancer " + loadBalancerId + ", the load balancer was not found.");
@@ -995,9 +996,12 @@ public class NetworkManagerImpl implements NetworkManager {
                 }
             }
 
+            List<Long> finalInstanceIds = new ArrayList<Long>();
             for (Long instanceId : instanceIds) {
                 if (mappedInstanceIds.contains(instanceId)) {
                     continue;
+                } else {
+                    finalInstanceIds.add(instanceId);
                 }
 
                 UserVmVO userVm = _vmDao.findById(instanceId);
@@ -1125,6 +1129,14 @@ public class NetworkManagerImpl implements NetworkManager {
                 }
                 if ((updatedRules != null) && (updatedRules.size() == firewallRulesToApply.size())) {
                     // flag the instances as mapped to the load balancer
+                    for (Long addedInstanceId : finalInstanceIds) {
+                        LoadBalancerVMMapVO mappedVM = new LoadBalancerVMMapVO(loadBalancerId, addedInstanceId);
+                        _loadBalancerVMMapDao.persist(mappedVM);
+                    }
+
+                    /* We used to add these instances as pending when the API command is received on the server, and once they were applied,
+                     * the pending status was removed.  In the 2.2 API framework, this is no longer done and instead the new mappings just
+                     * need to be persisted
                     List<LoadBalancerVMMapVO> pendingMappedVMs = _loadBalancerVMMapDao.listByLoadBalancerId(loadBalancerId, true);
                     for (LoadBalancerVMMapVO pendingMappedVM : pendingMappedVMs) {
                         if (instanceIds.contains(pendingMappedVM.getInstanceId())) {
@@ -1133,6 +1145,7 @@ public class NetworkManagerImpl implements NetworkManager {
                             _loadBalancerVMMapDao.update(pendingMappedVM.getId(), pendingMappedVMForUpdate);
                         }
                     }
+                     */
 
                     for (FirewallRuleVO updatedRule : updatedRules) {
                         if (updatedRule.getId() == null) {

From 97a8f3f9abb7a6ec5f1032dccc72193de5bf62b9 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 17:58:44 -0700
Subject: [PATCH 14/15] new UI - resources page - zonetree - make clickable
 area bigger for each tree node.

---
 ui/new/index.jsp                       | 24 ++++++++++++------------
 ui/new/scripts/cloud.core2.resource.js | 20 ++++++++++++++------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index ce3344a4fb3..ef39998a189 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -707,9 +707,9 @@ long milliseconds = new Date().getTime();
 	        <div class="leftmenu_content" id="header">  
 	            <div class="leftmenu_thirdindent">
 	                <div class="leftmenu_arrows expanded_close" id="zone_arrow">
-	                </div>
-	                
-	                Zone: <strong><span id="zone_name"></span></strong>
+	                </div>	                
+	                <span id="zone_name_label">Zone: </span>
+	                <span id="zone_name"></span>
 	            </div>  
 	        </div>			
             <div id="zone_content" style="display: none">
@@ -731,9 +731,9 @@ long milliseconds = new Date().getTime();
 	        <div class="leftmenu_content" id="header">
 	            <div class="leftmenu_fourthindent">
 	                <div class="leftmenu_arrows expanded_close" id="pod_arrow">
-	                </div>
-	               
-	                Pod: <strong><span id="pod_name"></span></strong>
+	                </div>	               
+	                <span id="pod_name_label">Pod: </span>
+	                <span id="pod_name"></span>
 	            </div>
 	        </div>	
             <div id="pod_content" style="display: none">
@@ -753,9 +753,9 @@ long milliseconds = new Date().getTime();
 	        <div class="leftmenu_content" id="header">
 	            <div class="leftmenu_fifthindent">
 	                <div class="leftmenu_arrows white_nonexpanded_close" id="cluster_arrow">
-	                </div>
-	                
-	                Cluster: <strong><span id="cluster_name"></span></strong>
+	                </div>	                
+	                <span id="cluster_name_label">Cluster: </span>	                
+                    <span id="cluster_name"></span>
 	            </div>
 	        </div>	
 			<div id="cluster_content">
@@ -773,9 +773,9 @@ long milliseconds = new Date().getTime();
 	        <div class="leftmenu_content" id="header">
 	            <div class="leftmenu_fourthindent">
 	                <div class="leftmenu_arrows white_nonexpanded_close" id="systemvm_arrow">
-	                </div>
-	             
-	                System VM: <strong><span id="systemvm_name"></span></strong>
+	                </div>	             
+	                <span id="systemvm_name_label">System VM: </span>
+	                <span id="systemvm_name"></span>
 	            </div>
 	        </div>
         </div>
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 88b3336b3cf..7f5a649f094 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -72,18 +72,20 @@ function buildZoneTree() {
 				}
 				break;	
 				
-				
+			
+			case "zone_name_label":	
 			case "zone_name":	
 			    selectTreeNodeInLeftMenu(target.parent().parent().parent());						    
-			    var jsonObj = target.data("jsonObj");  
+			    var jsonObj = target.parent().parent().parent().parent().data("jsonObj");  
 			    showPage($("#zone_page"), jsonObj);
 			    hideMiddleMenu();
 			    zoneJsonToRightPanel(jsonObj);			   				    		   			    
 			    break;		
 			    	
+			case "pod_name_label" :	
 			case "pod_name" :	
 			    selectTreeNodeInLeftMenu(target.parent().parent().parent());
-			    var jsonObj = target.data("jsonObj");
+			    var jsonObj = target.parent().parent().parent().parent().data("jsonObj");  
 			    showPage($("#pod_page"), jsonObj);	
 			    showMiddleMenu();	
 			    podJsonToDetailsTab(jsonObj);				
@@ -94,9 +96,10 @@ function buildZoneTree() {
 				listMidMenuItems2(("listStoragePools&podid="+podId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRigntPanel, primarystorageGetMidmenuId, false); 					
 	    		break;		
 				    
+			case "cluster_name_label" :	
 			case "cluster_name" :	
 			    selectTreeNodeInLeftMenu(target.parent().parent().parent());			    
-			    var jsonObj = target.data("jsonObj");
+			    var jsonObj = target.parent().parent().parent().parent().data("jsonObj");  
 			    showPage($("#cluster_page"), jsonObj);
 			    showMiddleMenu();
 			    clusterJsonToDetailsTab(jsonObj);
@@ -107,9 +110,10 @@ function buildZoneTree() {
 				listMidMenuItems2(("listStoragePools&clusterid="+clusterId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRigntPanel, primarystorageGetMidmenuId, false); 					
 	    		break;								
 						
+			case "systemvm_name_label" :
 			case "systemvm_name" :		
 			    selectTreeNodeInLeftMenu(target.parent().parent().parent());		
-			    var jsonObj = target.data("jsonObj");	
+			    var jsonObj = target.parent().parent().parent().parent().data("jsonObj");  
 			    showPage($("#systemvm_page"), jsonObj);		
 			    hideMiddleMenu();			
 				systemvmJsonToDetailsTab(jsonObj);			
@@ -133,6 +137,7 @@ function selectTreeNodeInLeftMenu($menuToSelect, expandable) {
 function zoneJSONToTreeNode(json, $zoneNode) {
     var zoneid = json.id;
     $zoneNode.attr("id", "zone_" + zoneid);  
+    $zoneNode.data("jsonObj", json);	 
     $zoneNode.data("id", zoneid).data("name", fromdb(json.name));
     var zoneName = $zoneNode.find("#zone_name").text(fromdb(json.name));	    
     zoneName.data("jsonObj", json);	    
@@ -175,7 +180,8 @@ function zoneJSONToTreeNode(json, $zoneNode) {
 
 function podJSONToTreeNode(json, $podNode) {	
     var podid = json.id;
-    $podNode.attr("id", "pod_" + podid);      	
+    $podNode.attr("id", "pod_" + podid); 
+    $podNode.data("jsonObj", json);     	
 	$podNode.data("id", podid).data("name", fromdb(json.name));
 	
 	var podName = $podNode.find("#pod_name").text(fromdb(json.name));
@@ -202,6 +208,7 @@ function podJSONToTreeNode(json, $podNode) {
 function systemvmJSONToTreeNode(json, $systemvmNode) {	
     var systemvmid = json.id;	
     $systemvmNode.attr("id", "systemvm_"+systemvmid);
+    $systemvmNode.data("jsonObj", json);	    
     $systemvmNode.data("id", systemvmid).data("name", json.name);	     
     var systeymvmName = $systemvmNode.find("#systemvm_name").text(json.name);	    
     systeymvmName.data("jsonObj", json);	    		
@@ -209,6 +216,7 @@ function systemvmJSONToTreeNode(json, $systemvmNode) {
 		
 function clusterJSONToTreeNode(json, $clusterNode) {
     $clusterNode.attr("id", "cluster_"+json.id);
+    $clusterNode.data("jsonObj", json);	  
     $clusterNode.data("id", json.id).data("name", fromdb(json.name));	    
     var clusterName = $clusterNode.find("#cluster_name").text(fromdb(json.name));
     clusterName.data("jsonObj", json);	   

From 87449c90819814b5f63cc30608083708db799d30 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 18:02:55 -0700
Subject: [PATCH 15/15] new UI - domain page - indent the whole tree 30 pixels
 by default.

---
 ui/new/scripts/cloud.core2.domain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index 36526713b2a..aa51c4bdb3f 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -37,7 +37,7 @@ function afterLoadDomainJSP() {
         domainIdNameMap[json.id] = json.name;               //map domainId to domainName
     
         var template = $treenodeTemplate.clone(true);	  
-        template.find("#domain_indent").css("marginLeft", (30*level));           
+        template.find("#domain_indent").css("marginLeft", (30*(level+1)));           
         template.attr("id", "domain_"+json.id);	         
         template.data("jsonObj", json).data("domainLevel", level); 	      
         template.find("#domain_title_container").attr("id", "domain_title_container_"+json.id);