Sorry - I never got to this in time. +1 to merge and I'll take a look at the marvin test post-merge.
On Tue, Apr 30, 2013 at 02:48:23PM -0000, Marcus Sorensen wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/10423/#review19951 > ----------------------------------------------------------- > > > The crickets have it. > > This patch doesn't apply cleanly. If you could update it I'll apply it to > master. > > Thanks! > > - Marcus Sorensen > > > On April 12, 2013, 4:12 p.m., Ryan Dietrich wrote: > > > > ----------------------------------------------------------- > > This is an automatically generated e-mail. To reply, visit: > > https://reviews.apache.org/r/10423/ > > ----------------------------------------------------------- > > > > (Updated April 12, 2013, 4:12 p.m.) > > > > > > Review request for cloudstack, Prasanna Santhanam, Chiradeep Vittal, and > > Marcus Sorensen. > > > > > > Description > > ------- > > > > https://issues.apache.org/jira/browse/CLOUDSTACK-1942 > > > > This patch will allow you to specify an IP when associating an IP to a VPC. > > > > > > Diffs > > ----- > > > > api/src/com/cloud/network/NetworkService.java ab6d7bf > > > > api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java > > 406f782 > > server/src/com/cloud/network/NetworkManager.java 4af716c > > server/src/com/cloud/network/NetworkManagerImpl.java a97f2ce > > server/src/com/cloud/network/NetworkServiceImpl.java 4eb620c > > server/test/com/cloud/network/MockNetworkManagerImpl.java 18eae08 > > server/test/com/cloud/vpc/MockNetworkManagerImpl.java bd4fd67 > > > > Diff: https://reviews.apache.org/r/10423/diff/ > > > > > > Testing > > ------- > > > > Manually tested using master branch, as well as 4.1. Tested manually using > > "ipid" as well as leaving it off resulting in existing functionality. > > > > Also, ran new marvin test. This probably could have been incorporated into > > the the existing test_network.py file, but half of those tests were failing > > on my system. > > > > > > Thanks, > > > > Ryan Dietrich > > > > > -- Prasanna.,
