----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/22863/#review48220 -----------------------------------------------------------
Can you rebase on latest master as the patch currently fails to apply. Cheers, Hugo patching file api/src/com/cloud/network/Network.java Hunk #1 FAILED at 132. Hunk #2 succeeded at 224 (offset 3 lines). 1 out of 2 hunks FAILED -- saving rejects to file api/src/com/cloud/network/Network.java.rej patching file api/src/com/cloud/network/Networks.java patching file api/src/com/cloud/network/PhysicalNetwork.java Hunk #1 FAILED at 33. 1 out of 1 hunk FAILED -- saving rejects to file api/src/com/cloud/network/PhysicalNetwork.java.rej patching file api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java patching file client/WEB-INF/classes/resources/messages.properties Hunk #1 FAILED at 327. Hunk #2 FAILED at 500. Hunk #3 succeeded at 880 (offset 6 lines). Hunk #4 succeeded at 1426 (offset 7 lines). Hunk #5 succeeded at 1639 with fuzz 2 (offset 7 lines). 2 out of 5 hunks FAILED -- saving rejects to file client/WEB-INF/classes/resources/messages.properties.rej patching file client/WEB-INF/classes/resources/messages_zh_CN.properties Hunk #1 FAILED at 297. Hunk #2 FAILED at 509. Hunk #3 succeeded at 1612 with fuzz 2 (offset 4 lines). 2 out of 3 hunks FAILED -- saving rejects to file client/WEB-INF/classes/resources/messages_zh_CN.properties.rej patching file client/pom.xml patching file client/tomcatconf/commands.properties.in Hunk #1 succeeded at 607 (offset 1 line). patching file plugins/pom.xml Hunk #1 succeeded at 64 (offset 1 line). patching file setup/db/db/schema-440to450.sql Hunk #1 succeeded at 244 with fuzz 2 (offset 20 lines). patching file test/integration/component/test_brocade_vcs.py patching file tools/apidoc/gen_toc.py Hunk #1 succeeded at 132 with fuzz 2. patching file ui/dictionary.jsp Hunk #1 FAILED at 349. Hunk #2 FAILED at 505. Hunk #3 succeeded at 870 (offset 7 lines). Hunk #4 succeeded at 1436 with fuzz 2 (offset 8 lines). Hunk #5 succeeded at 1742 (offset 9 lines). 2 out of 5 hunks FAILED -- saving rejects to file ui/dictionary.jsp.rej patching file ui/scripts/system.js Hunk #2 succeeded at 12240 (offset 243 lines). Hunk #3 succeeded at 19564 (offset 584 lines). Hunk #4 succeeded at 20343 (offset 615 lines). Hunk #5 succeeded at 20379 (offset 618 lines). patching file ui/scripts/ui-custom/zoneWizard.js Hunk #1 FAILED at 726. 1 out of 1 hunk FAILED -- saving rejects to file ui/scripts/ui-custom/zoneWizard.js.rej - Hugo Trippaers On July 17, 2014, 11:52 p.m., Ritu Sabharwal wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/22863/ > ----------------------------------------------------------- > > (Updated July 17, 2014, 11:52 p.m.) > > > Review request for cloudstack and Hugo Trippaers. > > > Bugs: CLOUDSTACK-6823 > https://issues.apache.org/jira/browse/CLOUDSTACK-6823 > > > Repository: cloudstack-git > > > Description > ------- > > First code drop for Brocade Network plugin to orchestrate Brocade VDX > switches for L2 connectivity. Please create a new branch for Brocade plugin. > > > Diffs > ----- > > api/src/com/cloud/network/Network.java 885bffe > api/src/com/cloud/network/Networks.java 1e4d229 > api/src/com/cloud/network/PhysicalNetwork.java 8cc214e > api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java > e73f526 > client/WEB-INF/classes/resources/messages.properties b504a18 > client/WEB-INF/classes/resources/messages_zh_CN.properties 1ec4e95 > client/pom.xml 29fef4f > client/tomcatconf/commands.properties.in d247aa0 > plugins/pom.xml b5e6a61 > setup/db/db/schema-440to450.sql 77445a9 > test/integration/component/test_brocade_vcs.py PRE-CREATION > tools/apidoc/gen_toc.py 827d6bf > ui/dictionary.jsp 9026a36 > ui/scripts/system.js 9a98a5c > ui/scripts/ui-custom/zoneWizard.js 4091c03 > > Diff: https://reviews.apache.org/r/22863/diff/ > > > Testing > ------- > > • Create an isolated network; verify that the port-profile is created on > the Brocade switch. > • Attach a VM to the network; verify that the VMs MAC address is > associated with the port profile of the network on the Brocade switch. > • Delete VMs for an isolated network; verify that the VMs MAC address is > disassociated with the port profile of the network on the Brocade switch. > • Delete the isolated network; verify that the port-profile is deleted > from the Brocade switch. > > Integration test result: > > Test Brocade Network and VM Creation ... === TestName: test_network_vcs | > Status : SUCCESS === > ok > > ---------------------------------------------------------------------- > Ran 1 test in 297.497s > > OK > > > File Attachments > ---------------- > > Diff for the existing cloudstack code > > https://reviews.apache.org/media/uploaded/files/2014/06/23/8fc3cfb1-7a21-4714-98f3-6514cf54ba84__diff > Patch file for Brocade functionality code > > https://reviews.apache.org/media/uploaded/files/2014/06/26/92bb0014-a7b7-4f0b-97c9-018d615b658a__brocade-vcs.patch > > > Thanks, > > Ritu Sabharwal > >
