----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/17888/#review36300 -----------------------------------------------------------
Fails to apply on the latest master :( alena@Alenas-MacBook-Air: [master]~/repos/dr/cloudstack$ git am --signoff < ~/Desktop/0001-Dispatcher-corrections-refactoring-and-tests.patch Applying: Dispatcher corrections, refactoring and tests error: patch failed: server/src/com/cloud/api/ApiServer.java:881 error: server/src/com/cloud/api/ApiServer.java: patch does not apply Patch failed at 0001 Dispatcher corrections, refactoring and tests The copy of the patch that failed is found in: /Users/alena/repos/dr/cloudstack/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". - Alena Prokharchyk On March 5, 2014, 10:35 a.m., Antonio Fornie wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/17888/ > ----------------------------------------------------------- > > (Updated March 5, 2014, 10:35 a.m.) > > > Review request for cloudstack, Alena Prokharchyk, daan Hoogland, and Hugo > Trippaers. > > > Repository: cloudstack-git > > > Description > ------- > > Dispatcher corrections, refactoring and tests. Corrects problems from > previous attempts that were reverted by Alena. Most of the changes are the > same, but this one is not creating conflicts of Map types for Aync Commands > or for parameters as Lists or Maps. > > > Diffs > ----- > > api/src/org/apache/cloudstack/api/ApiConstants.java 7b7f9ca > api/src/org/apache/cloudstack/api/BaseCmd.java e869ddf > api/src/org/apache/cloudstack/api/BaseListCmd.java c1a4b4c > api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java > b2c6734 > api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java > cf5d355 > > api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java > 570e018 > api/test/org/apache/cloudstack/api/BaseCmdTest.java PRE-CREATION > > server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml > fd2f5fb > server/src/com/cloud/api/ApiAsyncJobDispatcher.java f037f2e > server/src/com/cloud/api/ApiDispatcher.java 5bdefe7 > server/src/com/cloud/api/ApiServer.java 3df599e > server/src/com/cloud/api/ApiServlet.java 46f7eba > server/src/com/cloud/api/dispatch/CommandCreationWorker.java PRE-CREATION > server/src/com/cloud/api/dispatch/DispatchChain.java PRE-CREATION > server/src/com/cloud/api/dispatch/DispatchChainFactory.java PRE-CREATION > server/src/com/cloud/api/dispatch/DispatchTask.java PRE-CREATION > server/src/com/cloud/api/dispatch/DispatchWorker.java PRE-CREATION > server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java > PRE-CREATION > server/src/com/cloud/api/dispatch/ParamProcessWorker.java PRE-CREATION > server/src/com/cloud/api/dispatch/ParamSemanticValidationWorker.java > PRE-CREATION > server/src/com/cloud/api/dispatch/ParamUnpackWorker.java PRE-CREATION > server/src/com/cloud/network/as/AutoScaleManagerImpl.java 208b4a4 > server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java > 37171f5 > server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java a85c052 > server/test/com/cloud/api/ApiDispatcherTest.java 7314a57 > server/test/com/cloud/api/dispatch/CommandCreationWorkerTest.java > PRE-CREATION > server/test/com/cloud/api/dispatch/DispatchChainFactoryTest.java > PRE-CREATION > server/test/com/cloud/api/dispatch/ParamGenericValidationWorkerTest.java > PRE-CREATION > server/test/com/cloud/api/dispatch/ParamProcessWorkerTest.java PRE-CREATION > server/test/com/cloud/api/dispatch/ParamSemanticValidationWorkerTest.java > PRE-CREATION > > Diff: https://reviews.apache.org/r/17888/diff/ > > > Testing > ------- > > Full build and test plus manually testing many features. Also including > CreateTagsCommand that failed in previous commit. > > All unit and integration tests. > > Test CS Web UI with the browser going through several use cases. > > Also use the CS API by sending HTTP requests generated manually including > requests for Async Commands with Map parameters and during these tests apart > fromtesting correct functionality I also debugged to check that Maps created > correctly where they should but also that in the cases where the async > command must be persisted and later on retrieved and deserialized by gson > everything works ok and does what and where is expected. An example based on > the comment by Alena: > http://localhost:8096/client/api?command=createTags&resourceids=ids&resourcetype=type&tags[0].key=region&tags[0].value=canada > Also other examples like > http://localhost:8096/client/api?command=createSecondaryStagingStore&url=httpbla&details[0].key=region&details[0].value=canada&details[1].key=element&details[1].value=fire > > > Thanks, > > Antonio Fornie > >
