I've successfully applied the patch anyway. Thank you!
--Sheng On Thu, May 16, 2013 at 2:55 PM, Vijayendra Bhamidipati < vijayendra.bhamidip...@citrix.com> wrote: > > I'm done with implementation of pvlan changes for VMWare - I've tested and > uploaded the diffs as a file on top of the current master branch to > https://reviews.apache.org/r/11019/ > > I wasn't able to update the patch on review board though - I run into the > error " error: short SHA1 01a0384 is ambiguous. fatal: Not a valid object > name 01a0384". This seems to be happening due to a clash with a short sha1 > on the remote master, and isn't going away even if I use a clean new > workspace to build the patch. Anyone has any idea why this happens and how > I can avoid this on git? I'm sure this isn't anything to do with > reviewboard as such. > > Regards, > Vijay > > -----Original Message----- > From: Sheng Yang [mailto:sh...@yasker.org] > Sent: Tuesday, May 14, 2013 12:05 PM > To: <dev@cloudstack.apache.org> > Subject: Re: [MERGE]PVLAN branch to MASTER(v2) > > On Mon, May 13, 2013 at 6:58 PM, Chip Childers <chipchild...@apache.org > >wrote: > > > On Mon, May 13, 2013 at 03:16:28PM -0700, Sheng Yang wrote: > > > FS at: > > > > > https://cwiki.apache.org/CLOUDSTACK/pvlan-for-isolation-within-a-vlan. > > html > > > > > > PVLAN branch has been under development for some time, and now the > > > functionality works on KVM and Xen, would be followed by VMware soon > > > > > > VM live migration is not supported so far. Code is ready basically, > > > but I am waiting for the fix of > > > https://issues.apache.org/jira/browse/CLOUDSTACK-1638 . > > > > > > We're using ovs/open flow to manipulate ingress/egress traffic to > > > emulate the isolation PVLAN function on KVM and Xen. The details are > in the FS. > > > > > > The core code change is minimal and there is no DB change, because > > > we > > took > > > advantage of "broadcast domain" to introduce "pvlan://" broadcast > > > URI to describe the primary and isolated PVLAN for the network. > > > > > > The code has passed the RAT, and no new dependency is added. > > > > How is the OpenFlow functionality controlled? Via libvirt? > > > > No, CS would execute the ovs-ofctl command. Libvirt(in kvm) would in > charge of allocating vlan etc, but won't involve in openflow part. > > --Sheng > > > > > > > > > I've added a new integration smoke test test_pvlan.py. Related unit > > > tests are also added for NetUtils. I've done some basic regression > > > tests, so > > far > > > so good. Sangeetha already tested the functionality of Xen part, and > > > it works. > > > > > > Integration test at: test/integration/smoke/test_pvlan.py > > > > > > If there is no objection, I would merge the branch in 48 hours. > > > > > > Thanks. > > > > > > --Sheng > > >
