CLOUDSTACK-2789: UpdateVPC shouldn't require name parameter

Alena Prokharchyk · Alena Prokharchyk · commit e5335cd6e488 · 2014-02-04T15:47:13.000-08:00
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
@@ -20,7 +20,7 @@
 public abstract class BaseAsyncCustomIdCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.CUSTOM_ID,
                type = CommandType.STRING,
-               description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
+ description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only", since = "4.4")
     private String customId;
 
     public String getCustomId() {
diff --git a/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java b/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
@@ -20,7 +20,7 @@ public abstract class BaseCustomIdCmd extends BaseCmd {
 
     @Parameter(name = ApiConstants.CUSTOM_ID,
                type = CommandType.STRING,
-               description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
+ description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only", since = "4.4")
     private String customId;
 
     public String getCustomId() {
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
@@ -42,7 +42,7 @@ public class UpdateVPCCmd extends BaseAsyncCustomIdCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VpcResponse.class, required = true, description = "the id of the VPC")
     private Long id;
 
-    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the VPC", required = true)
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the VPC")
     private String vpcName;
 
     @Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "the display text of the VPC")
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -776,7 +776,7 @@ public Vpc updateVpc(long vpcId, String vpcName, String displayText, String cust
         // Verify input parameters
         VpcVO vpcToUpdate = _vpcDao.findById(vpcId);
         if (vpcToUpdate == null) {
-            throw new InvalidParameterValueException("Unable to find vpc offering " + vpcId);
+            throw new InvalidParameterValueException("Unable to find vpc by id " + vpcId);
         }
 
         _accountMgr.checkAccess(caller, null, false, vpcToUpdate);

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ public Vpc updateVpc(long vpcId, String vpcName, String displayText, String cust`
`776`	`776`	`// Verify input parameters`
`777`	`777`	`VpcVO vpcToUpdate = _vpcDao.findById(vpcId);`
`778`	`778`	`if (vpcToUpdate == null) {`
`779`		`- throw new InvalidParameterValueException("Unable to find vpc offering " + vpcId);`
	`779`	`+ throw new InvalidParameterValueException("Unable to find vpc by id " + vpcId);`
`780`	`780`	`}`
`781`	`781`
`782`	`782`	`_accountMgr.checkAccess(caller, null, false, vpcToUpdate);`