[openflowplugin-dev] [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen
|
Michal Rehak -X (mirehak - PANTHEON TECHNOLOGIES@Cisco) <mirehak@...>
Hi all,
merging ofjava with ofplugin yields some conflicts: Conflicts: .gitignore .gitreview artifacts/pom.xml parent/pom.xml pom.xml .git* and aggregate/pom are trivial to solve. Inspecting artifacts/pom and parent/pom I came to conclusion that decision regarding ofjava version is required as first step (to keep or to overwrite with ofplugin version). Base on that the rest can be resolved easily. I tried to create draft of the whole merge but gerrit rejected it because of many missing change-ids and one missing sign-off. So gerrit + merge way is probably too inconvenient. Regards, Michal _____________________________________ From: openflowplugin-dev-bounces@... <openflowplugin-dev-bounces@...> on behalf of Robert Varga <nite@...> Sent: Tuesday, June 27, 2017 13:14 To: Tomáš Slušný; release@... Cc: openflowjava-dev@...; tsc@...; Michal Rehák; openflowplugin-dev Subject: Re: [openflowplugin-dev] [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen On 27/06/17 12:52, Tomáš Slušný wrote: Hello Robert,What we have done in the past was to ask Linux Foundation admins to populate the repository, side-stepping gerrit. We have done this for mdsal and netconf at least. I am not sure if the same effect is doable with gerrit. Regards, Robert |
|
Tomáš Slušný <tomas.slusny@...>
Hi Michal,
these conflicts can be resolved by using git subtree instead of git merge, as subtree can "merge" repository/branch into subdirectory. I prepared this OpenFlowJava merge in 3 patches, first one is just adding OpenFlowJava to subdirectory "openflowjava", second one is actually to integrate new OpenFlowJava code into OpenFlowPlugin build (as, being in subdirectory, cut from rest of project, distribution checks will pass because OpenFlowJava will not be built). And third one is cleanup. First patch can be easily abandoned and replaced with solution what Robert suggested, and that is merging (or in this case, using git subtree) instead of plain copy of OpenFlowJava code, then second one can be rebased on master after first step will be done and pushed into repository (with some small changes, and that are removing .gitignore and .gitreview from openflowjava subdirectory, as I copied code without these 2 files in original first patch).
Also, during testing this migration, I noticed that distribution checks do not allow to have "org.opendaylight.openflowjava.*" and "org.opendaylight.openflowplugin.*" in same project, so I changed "org.opendaylight.openflowjava" groupId to "org.opendaylight.openflowplugin.openflowjava", so with this thing in mind, I think it is also natural to switch to OpenFlowPlugin versioning from OpenFlowJava versioning.
Regards, Tomas Od: Michal Rehak -X (mirehak - PANTHEON TECHNOLOGIES at Cisco) <mirehak@...>
Odoslané: utorok, 27. júna 2017 16:11 Komu: Robert Varga; Tomáš Slušný; release@... Kópia: openflowjava-dev@...; tsc@...; Michal Rehák; openflowplugin-dev Predmet: Re: [openflowplugin-dev] [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen Hi all, merging ofjava with ofplugin yields some conflicts: Conflicts: .gitignore .gitreview artifacts/pom.xml parent/pom.xml pom.xml .git* and aggregate/pom are trivial to solve. Inspecting artifacts/pom and parent/pom I came to conclusion that decision regarding ofjava version is required as first step (to keep or to overwrite with ofplugin version). Base on that the rest can be resolved easily. I tried to create draft of the whole merge but gerrit rejected it because of many missing change-ids and one missing sign-off. So gerrit + merge way is probably too inconvenient. Regards, Michal _____________________________________ From: openflowplugin-dev-bounces@... <openflowplugin-dev-bounces@...> on behalf of Robert Varga <nite@...>
Sent: Tuesday, June 27, 2017 13:14 To: Tomáš Slušný; release@... Cc: openflowjava-dev@...; tsc@...; Michal Rehák; openflowplugin-dev Subject: Re: [openflowplugin-dev] [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen On 27/06/17 12:52, Tomáš Slušný wrote: > Hello Robert, > > > I can import OpenFlowJava using `git subtree` to not lose history (and I > actually have it already prepared in my local repository, because that > was first thing I tried), but then it would create Gerrit patch for each > OpenFlowJava commit if I am not wrong. Or is there another method of > doing this merge? What we have done in the past was to ask Linux Foundation admins to populate the repository, side-stepping gerrit. We have done this for mdsal and netconf at least. I am not sure if the same effect is doable with gerrit. Regards, Robert Tomáš Slušný
Software Developer
PANTHEON
technologies s.r.o.
Janka Kráľa 9, 974 01 Banská Bystrica
Slovakia
Tel / +421 220 665 111
MAIL
/
tomas.slusny@...
WEB
/
https://pantheon.tech
|
|
Anil Vishnoi
Just for a my clarity, merging these two project won't require TSC approval and permission from the openflowjava project PTL/Committer? I think we have the latter, but not the first if requires. On Tue, Jun 27, 2017 at 10:42 AM, Tomáš Slušný <tomas.slusny@...> wrote:
--
Thanks Anil |
|
Anil Vishnoi
So looks like we don't need a TSC approval for this merge. Only committers needs to agree on it. Though it's good to have an official vote from openflowjava committer about this merger. So i think overall we are good. On Tue, Jun 27, 2017 at 10:46 AM, Anil Vishnoi <vishnoianil@...> wrote:
--
Thanks Anil |
|
Sam Hague
In NetVirt when we pulled in VPN service we did what Robert mentioned. Andy copied the whole vpnservice branch into NetVirt and kept all the history. There were a specific order of commands to use to get it right. From there we adjusted the artifact ids. On Jun 27, 2017 1:44 PM, "Tomáš Slušný" <tomas.slusny@...> wrote:
|