From b9a242332be6fb1c4dc9545d1a60624daa9b8aff Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Thu, 28 Oct 2010 11:27:36 -0700
Subject: [PATCH 1/5] fix cloud-tool to list all the available apis

---
 cloud-cli/cloudapis/cloud.py    |  2 ++
 cloud-cli/cloudtool/__init__.py |  2 +-
 cloud-cli/cloudtool/utils.py    | 15 +++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cloud-cli/cloudapis/cloud.py b/cloud-cli/cloudapis/cloud.py
index 69abf9ef17f..07276b4446e 100644
--- a/cloud-cli/cloudapis/cloud.py
+++ b/cloud-cli/cloudapis/cloud.py
@@ -111,3 +111,5 @@ for name,meth in load_dynamic_methods(): setattr(CloudAPI,name,meth)
 implementor = CloudAPI
 
 del name,meth,describe,load_dynamic_methods
+
+
diff --git a/cloud-cli/cloudtool/__init__.py b/cloud-cli/cloudtool/__init__.py
index e6d00be5fe1..a1062ff529c 100644
--- a/cloud-cli/cloudtool/__init__.py
+++ b/cloud-cli/cloudtool/__init__.py
@@ -20,7 +20,7 @@ def main(argv=None):
     api = __import__("cloudapis")
     apis = getattr(api, "implementor")
     if len(prelim_args) == 0:
-        parser.error("you need to specify an API as the first argument\n\nSupported APIs:\n" + "\n".join(utils.get_api_list()))
+        parser.error("you need to specify an API as the first argument\n\nSupported APIs:\n" + "\n".join(utils.get_api_list(apis)))
     elif len(prelim_args) == 1:
         commandlist = utils.get_command_list(apis)
         parser.error("you need to specify a command name as the second argument\n\nCommands supported by the %s API:\n"%prelim_args[0] + "\n".join(commandlist))
diff --git a/cloud-cli/cloudtool/utils.py b/cloud-cli/cloudtool/utils.py
index 2bcef9569c3..6c7456feb42 100644
--- a/cloud-cli/cloudtool/utils.py
+++ b/cloud-cli/cloudtool/utils.py
@@ -165,14 +165,13 @@ def lookup_command_in_api(api,command_name):
     command = getattr(api,command_name.replace("-","_"),None)
     return command
 
-def get_api_list():
-        apilist = []
-        for api in apis.get_all_apis():
-            api_module = api
-            api_name = api.__name__.split(".")[-1]
-            if not api_name.startswith("_") and hasattr(api_module,'__doc__'):
-                apilist.append( "    %20s     %s"%(api_name.replace("_",'-'),api_module.__doc__) )
-        return apilist
+def get_api_list(api):
+	apilist = []
+	for cmd_name in dir(api):
+		cmd = getattr(api,cmd_name)
+            	if callable(cmd) and not cmd_name.startswith("_"):
+			apilist.append(cmd_name)	
+	return apilist
 
 def get_command_list(api):
         cmds = []

From d2e58131a2161dbd05d32d2583b107dbfcb9b2c2 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Thu, 28 Oct 2010 12:18:01 -0700
Subject: [PATCH 2/5] Grid layout added to Globalsetting.jsp

---
 ui/new/jsp/globalsetting.jsp | 97 +++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/ui/new/jsp/globalsetting.jsp b/ui/new/jsp/globalsetting.jsp
index 4362cdb055b..547c5f7ab55 100644
--- a/ui/new/jsp/globalsetting.jsp
+++ b/ui/new/jsp/globalsetting.jsp
@@ -34,71 +34,78 @@
                    <p>Loading &hellip;</p>    
               </div>               
         </div>
-        <div class="grid_actionpanel">
-            <div class="grid_editbox" id="edit_button">
-            </div>
-                        
-        </div>
         <div class="grid_container">
         	<div class="grid_header">
-            	<div id="grid_header_title" class="grid_header_title">(title)</div>
-                <div id="action_link" class="grid_actionbox" id="account_action_link">
-                    <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
-                        <ul class="actionsdropdown_boxlist" id="action_list">
-                        	<li><%=t.t("no.available.actions")%></li>
-                        </ul>
-                    </div>
+            	<div class="grid_header_cell" style="width:25%;">
+            		<div class="grid_header_title">Name</div>
                 </div>
-                <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
-                display: none;">
-                    <div class="gridheader_loader" id="Div1">
-                    </div>
-                    <p id="description">
-                        Waiting &hellip;</p>
-                </div>     
-            </div>
-            <div class="grid_rows odd">
-                <div class="grid_row_cell" style="width: 20%;">
-                    <div class="row_celltitles">
-                        <%=t.t("name")%>:</div>
+                <div class="grid_header_cell" style="width:20%;">
+            		<div class="grid_header_title">Value</div>
                 </div>
-                <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="name">
-                    </div>
+                <div class="grid_header_cell" style="width:24%;">
+            		<div class="grid_header_title">Description</div>
                 </div>
+                <div class="grid_header_cell" style="width:20%;">
+            		<div class="grid_header_title">Category</div>
+                </div>
+                <div class="grid_header_cell" style="width:10%;">
+            		<div class="grid_header_title"></div>
+                </div>
+                     
             </div>
             <div class="grid_rows even">
-                <div class="grid_row_cell" style="width: 20%;">
-                    <div class="row_celltitles">
-                        <%=t.t("value")%>:</div>
+                <div class="grid_row_cell" style="width: 25%;">
+                    <div class="row_celltitles" id="name"></div>
                 </div>
-                <div class="grid_row_cell" style="width: 79%;">
+                <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles" id="value">
                     </div>                    
                     <input class="text" id="value_edit" style="width: 200px; display: none;" type="text" />
                     <div id="value_edit_errormsg" style="display:none"></div>                    
                 </div>
-            </div>
-            <div class="grid_rows odd">
-                <div class="grid_row_cell" style="width: 20%;">
-                    <div class="row_celltitles">
-                        <%=t.t("description")%>:</div>
-                </div>
-                <div class="grid_row_cell" style="width: 79%;">
+                <div class="grid_row_cell" style="width: 24%;">
                     <div class="row_celltitles" id="description">
                     </div>
                 </div>
-            </div>            
-            <div class="grid_rows even">
                 <div class="grid_row_cell" style="width: 20%;">
-                    <div class="row_celltitles">
-                        <%=t.t("category")%>:</div>
-                </div>
-                <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="category">
                     </div>
                 </div>
-            </div>               
+                <div class="grid_row_cell" style="width: 10%;">
+                    <div class="row_celltitles">
+                    	<a id="edit_button" href="#">Edit</a>
+                    </div>
+                </div>
+               
+            </div>
+            
+            <div class="grid_rows odd">
+                <div class="grid_row_cell" style="width: 25%;">
+                    <div class="row_celltitles" id="name"></div>
+                </div>
+                <div class="grid_row_cell" style="width: 20%;">
+                    <div class="row_celltitles" id="value">
+                    </div>                    
+                    <input class="text" id="value_edit" style="width: 200px; display: none;" type="text" />
+                    <div id="value_edit_errormsg" style="display:none"></div>                    
+                </div>
+                <div class="grid_row_cell" style="width: 24%;">
+                    <div class="row_celltitles" id="description">
+                    </div>
+                </div>
+                <div class="grid_row_cell" style="width: 20%;">
+                    <div class="row_celltitles" id="category">
+                    </div>
+                </div>
+                <div class="grid_row_cell" style="width: 10%;">
+                    <div class="row_celltitles">
+                    	<a href="#">Edit</a>
+                    </div>
+                </div>
+               
+            </div>
+                        
+                           
         </div>        
         <div class="grid_botactionpanel">
         	<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>

From 4dd80655c85a59ba1e9d575c28d7fb0a20e49230 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Thu, 28 Oct 2010 13:27:05 -0700
Subject: [PATCH 3/5] Hypervisor added for Blank template and Custom Size
 browught down on next line

---
 ui/new/jsp/instance.jsp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index a6975a7259b..bb3eac642fb 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -310,19 +310,24 @@
                             </div>
                             <div class="rev_wizmid_tempbox_right">
                                 <div class="rev_wiztemplistpanel" id="template_container">
-                                    <!--  
+                                   
                                     <div id="vmtemplate_in_vmwizard" class="rev_wiztemplistbox">
-                                        <div id="icon">
+                                        <div id="icon" class="rev_wiztemo_centosicons">
                                         </div>
                                         <div class="rev_wiztemp_listtext">
-                                            <span id="name"></span>
+                                            <span id="name">Centos</span>
                                             <div class="rev_wiztemp_listtext hypervisortext">
-                                                Hypervisor: <strong id="hypervisor"></strong></div>
+                                                Hypervisor: <select class="select" style="width:70px; float:none; height:15px; font-size:10px; margin:0 0 0 5px; display:inline;">
+                                                	<option value="op1">Hypervisor 1 </option>
+                                                    <option value="op1">Hypervisor 2</option>
+                                                    <option value="op1">Hypervisor 3</option>
+                                                </select>
+                                            </div>
                                         </div>
                                         <div class="rev_wiztemp_ownertext">
                                             [Submitted by: <span id="submitted_by"></span>]</div>
                                     </div>                                    
-                                    -->
+                                   
                                 </div>
                                 <div class="rev_wiztemplistactions">
                                     <div class="rev_wiztemplist_actionsbox">
@@ -729,12 +734,15 @@
     <input type="radio" class="radio" value="custom" checked />
     <label class="label">
         Custom:</label>
-    <label class="label1">
-        Disk Size:</label>
-    <input type="text" id="custom_disk_size" class="text" />
-    <span>MB</span>
-    <div id="custom_disk_size_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-    </div>
+    <div class="vmpopup_offdescriptionbox_bot" style="background:none;">
+        <label class="label1" style="margin-left:33px; display:inline;">
+            Disk Size:</label>
+        <input type="text" id="custom_disk_size" class="text" />
+        <span>MB</span>
+       
+        <div id="custom_disk_size_errormsg" class="errormsg" style="display: none;">
+        </div>
+     </div>
 </div>
 <div class="vmpopup_offeringbox" id="vm_popup_disk_offering_template_existing" style="display: none">
     <input type="radio" class="radio" checked />

From c5fef26f1133f7f57f45d8c3177f79eaa73e38c0 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Thu, 28 Oct 2010 13:28:33 -0700
Subject: [PATCH 4/5] ListTemplates will no longer return any SystemVM
 templates.  I am using a startsWith() string match for now since we used to
 make this comparision by ID with a single hypervisor.

---
 .../cloud/api/commands/ListTemplatesCmd.java    |  5 ++++-
 ui/new/scripts/cloud.core2.instance.js          | 17 +++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java
index 2d25fdf32d4..ccb33ea9dcd 100644
--- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java
+++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java
@@ -39,6 +39,7 @@ import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.dao.VMTemplateDao.TemplateFilter;
 import com.cloud.storage.template.TemplateConstants;
 import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
 import com.cloud.user.UserContext;
 
 @Implementation(method="listTemplates", description="List all public, private, and privileged templates.")
@@ -151,7 +152,9 @@ public class ListTemplatesCmd extends BaseListCmd {
         List<TemplateResponse> templateResponses = new ArrayList<TemplateResponse>();
 
         for (VMTemplateVO template : templates) {
-            if (!showDomr && template.getId() == TemplateConstants.DEFAULT_SYSTEM_VM_DB_ID) {
+        	// Since we've added multiple domR templates and with different DB ids, I'm changing
+        	// this to filter out any templates with names that start with system for now.
+            if (!showDomr && template.getName().startsWith("SystemVM")) {
                 continue;
             }
 
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 0a19ddcf45a..7f4f6f16352 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -537,11 +537,10 @@ function initVMWizard() {
         var commandString;    		  	   
         var searchInput = $vmPopup.find("#search_input").val();   
         if (selectedTemplateTypeInVmPopup != "blank") {  //template   
-            var hypervisor = $vmPopup.find("#wizard_hypervisor").val();	                
             if (searchInput != null && searchInput.length > 0)                 
-                commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup; 
+                commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup; 
             else
-                commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&page="+currentPageInTemplateGridInVmPopup;           		    		
+                commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup;           		    		
 	    } 
 	    else {  //ISO
 	        if (searchInput != null && searchInput.length > 0)                 
@@ -673,13 +672,6 @@ function initVMWizard() {
         return false;
     });
             
-    $vmPopup.find("#wizard_hypervisor").bind("change", function(event) {       
-        var selectedHypervisor = $(this).val();
-        if(selectedHypervisor != null && selectedHypervisor.length > 0)
-            listTemplatesInVmPopup();         
-        return false;
-    });        
-   
     function displayDiskOffering(type) {
         if(type=="data") {
             $vmPopup.find("#wizard_data_disk_offering_title").show();
@@ -763,8 +755,9 @@ function initVMWizard() {
 		        $thisPopup.find("#root_disk_offering_container").hide();			       
 		    }	
 			
-			$thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());    
-			$thisPopup.find("#wizard_review_hypervisor").text($thisPopup.find("#wizard_hypervisor option:selected").text());   	
+			$thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());    
+			// This is taking from the selected template but need to change this to the dropdown that supports ISO.
+			$thisPopup.find("#wizard_review_hypervisor").text($selectedVmWizardTemplate.data("hypervisor"));   	
 			$thisPopup.find("#wizard_review_template").text($thisPopup.find("#step1 .rev_wiztemplistbox_selected .rev_wiztemp_listtext").text()); 
 	    }			
 		

From d074396f0c41aa389f87ca19a70e88ccb5d7d16f Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Thu, 28 Oct 2010 13:46:32 -0700
Subject: [PATCH 5/5] Status color added to Host

---
 ui/new/css/main.css | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index 93de1d09cfe..ea08e1b8ccd 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -2556,6 +2556,45 @@ a:hover.search_button {
 	padding:0;
 }
 
+.row_celltitles.status_red {
+	width:auto;
+	height:auto;
+	float:left;
+	color:#AB0202;
+	text-align:left;
+	font-size:11px;
+	font-weight:bold;
+	margin:0 0 0 10px;
+	display:inline;
+	padding:0;
+}
+
+.row_celltitles.status_green {
+	width:auto;
+	height:auto;
+	float:left;
+	color:#538002;
+	text-align:left;
+	font-size:11px;
+	font-weight:bold;
+	margin:0 0 0 10px;
+	display:inline;
+	padding:0;
+}
+
+.row_celltitles.status_gray {
+	width:auto;
+	height:auto;
+	float:left;
+	color:#666666;
+	text-align:left;
+	font-size:11px;
+	font-weight:bold;
+	margin:0 0 0 10px;
+	display:inline;
+	padding:0;
+}
+
 .row_celltitles.alert {
 	width:100%;
 	height:auto;