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 = [] 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 templateResponses = new ArrayList(); 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/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; 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 @@

Loading …

-
-
-
- -
-
(title)
- -
-
-
- <%=t.t("name")%>:
+
+
Value
-
-
-
+
+
Description
+
+
Category
+
+
+
+
+
-
-
- <%=t.t("value")%>:
+
+
-
+
-
-
-
-
- <%=t.t("description")%>:
-
-
+
-
-
-
- <%=t.t("category")%>:
-
-
-
+
+
+ Edit +
+
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+ Edit +
+
+ +
+ +
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 @@
- +
@@ -729,12 +734,15 @@ - - - MB - +
+ + + MB + + +