ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching

Alena Prokharchyk · Alena Prokharchyk · commit 7cb4b571c8eb · 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
@@ -27,6 +27,6 @@ public String getCustomId() {
         return customId;
     }
 
-    public abstract void checkUuid(String id, Class<?> cls);
+    public abstract void checkUuid();
 
 }
diff --git a/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java b/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
@@ -27,6 +27,6 @@ public String getCustomId() {
         return customId;
     }
 
-    public abstract void checkUuid(String id, Class<?> cls);
+    public abstract void checkUuid();
 
 }
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
@@ -155,7 +155,7 @@ public ApiCommandJobType getInstanceType() {
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), AutoScaleVmGroup.class);
         }
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
@@ -147,7 +147,7 @@ public ApiCommandJobType getInstanceType() {
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), AutoScaleVmProfile.class);
         }
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
@@ -174,7 +174,7 @@ public void execute() throws ResourceUnavailableException {
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), NetworkACLItem.class);
         }
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
@@ -190,7 +190,7 @@ public Long getSyncObjId() {
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), Network.class);
         }
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -148,7 +148,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), UserVm.class);
 
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
@@ -150,7 +150,7 @@ public void execute() {
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), Volume.class);
         }
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
@@ -115,7 +115,7 @@ public Long getSyncObjId() {
     }
 
     @Override
-    public void checkUuid(String id, Class<?> cls) {
+    public void checkUuid() {
         if (this.getCustomId() != null) {
             _uuidMgr.checkUuid(this.getCustomId(), Vpc.class);
         }
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
@@ -21,14 +21,16 @@
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
-import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseAsyncCreateCmd;
+import org.apache.cloudstack.api.BaseAsyncCustomIdCmd;
 import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.BaseCustomIdCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.jobs.AsyncJob;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.log4j.Logger;
 
 import com.cloud.api.dispatch.DispatchChain;
 import com.cloud.api.dispatch.DispatchChainFactory;
@@ -97,6 +99,13 @@ public void dispatch(final BaseCmd cmd, final Map<String, Object> params, final
                 }
             }
         }
+
+        if (cmd instanceof BaseAsyncCustomIdCmd) {
+            ((BaseAsyncCustomIdCmd)cmd).checkUuid();
+        } else if (cmd instanceof BaseCustomIdCmd) {
+            ((BaseCustomIdCmd)cmd).checkUuid();
+        }
+
         cmd.execute();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public String getCustomId() {`
`27`	`27`	`return customId;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public abstract void checkUuid(String id, Class<?> cls);`
	`30`	`+ public abstract void checkUuid();`
`31`	`31`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public ApiCommandJobType getInstanceType() {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`@Override`
`158`		`- public void checkUuid(String id, Class<?> cls) {`
	`158`	`+ public void checkUuid() {`
`159`	`159`	`if (this.getCustomId() != null) {`
`160`	`160`	`_uuidMgr.checkUuid(this.getCustomId(), AutoScaleVmGroup.class);`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public ApiCommandJobType getInstanceType() {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`@Override`
`150`		`- public void checkUuid(String id, Class<?> cls) {`
	`150`	`+ public void checkUuid() {`
`151`	`151`	`if (this.getCustomId() != null) {`
`152`	`152`	`_uuidMgr.checkUuid(this.getCustomId(), AutoScaleVmProfile.class);`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public void execute() throws ResourceUnavailableException {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`@Override`
`177`		`- public void checkUuid(String id, Class<?> cls) {`
	`177`	`+ public void checkUuid() {`
`178`	`178`	`if (this.getCustomId() != null) {`
`179`	`179`	`_uuidMgr.checkUuid(this.getCustomId(), NetworkACLItem.class);`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public Long getSyncObjId() {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`@Override`
`193`		`- public void checkUuid(String id, Class<?> cls) {`
	`193`	`+ public void checkUuid() {`
`194`	`194`	`if (this.getCustomId() != null) {`
`195`	`195`	`_uuidMgr.checkUuid(this.getCustomId(), Network.class);`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`@Override`
`151`		`- public void checkUuid(String id, Class<?> cls) {`
	`151`	`+ public void checkUuid() {`
`152`	`152`	`if (this.getCustomId() != null) {`
`153`	`153`	`_uuidMgr.checkUuid(this.getCustomId(), UserVm.class);`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public void execute() {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`@Override`
`153`		`- public void checkUuid(String id, Class<?> cls) {`
	`153`	`+ public void checkUuid() {`
`154`	`154`	`if (this.getCustomId() != null) {`
`155`	`155`	`_uuidMgr.checkUuid(this.getCustomId(), Volume.class);`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public Long getSyncObjId() {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@Override`
`118`		`- public void checkUuid(String id, Class<?> cls) {`
	`118`	`+ public void checkUuid() {`
`119`	`119`	`if (this.getCustomId() != null) {`
`120`	`120`	`_uuidMgr.checkUuid(this.getCustomId(), Vpc.class);`
`121`	`121`	`}`