diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java index 96cd245a32e..10ef70a28f8 100755 --- a/api/src/com/cloud/api/ApiConstants.java +++ b/api/src/com/cloud/api/ApiConstants.java @@ -134,7 +134,7 @@ public class ApiConstants { public static final String SCHEDULE = "schedule"; public static final String SCOPE = "scope"; public static final String SECRET_KEY = "secretkey"; - public static final String SECURITY_GROUP_ID_LIST = "securitygroupidlist"; + public static final String SECURITY_GROUP_IDS = "securitygroupids"; public static final String SECURITY_GROUP_NAME = "securitygroupname"; public static final String SECURITY_GROUP_ID = "securitygroupid"; public static final String SENT = "sent"; diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java index 7cfa8ddff85..d939cb1c8cd 100644 --- a/api/src/com/cloud/api/commands/DeployVMCmd.java +++ b/api/src/com/cloud/api/commands/DeployVMCmd.java @@ -71,7 +71,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { @Parameter(name=ApiConstants.HYPERVISOR, type=CommandType.STRING, description="the hypervisor on which to deploy the virtual machine") private String hypervisor; - @Parameter(name=ApiConstants.SECURITY_GROUP_ID_LIST, type=CommandType.LIST, collectionType=CommandType.LONG, description="comma separated list of security groups id that going to be applied to the virtual machine. Should be passed only when vm is created from service offering with Direct Attach Network support") + @Parameter(name=ApiConstants.SECURITY_GROUP_IDS, type=CommandType.LIST, collectionType=CommandType.LONG, description="comma separated list of security groups id that going to be applied to the virtual machine. Should be passed only when vm is created from a zone with Basic Network support") private List securityGroupIdList; @Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.LONG, required=true, description="the ID of the service offering for the virtual machine") diff --git a/ui/css/main.css b/ui/css/main.css index 4654fa60222..9e3eced5ece 100644 --- a/ui/css/main.css +++ b/ui/css/main.css @@ -1318,6 +1318,20 @@ a:hover { color:#333; } +.multiple { + background-color: #e9f6ff; + font: normal 12px Arial, Helvetica, sans-serif; + font-weight:normal; + float:left; + border: 1px solid #61869b; + padding:2px 2px 0 2px; + height: 80px; + width: 400px; + margin:0; + padding:0; + color:#333; +} + .rev_wizformarea .select { background-color: #e9f6ff; font: normal 12px Arial, Helvetica, sans-serif; diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index bba838e90cd..26509af01ad 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -682,7 +682,7 @@ dictionary = {