openshift / openshift-sdn

Apache License 2.0
69 stars 63 forks source link

plugin reorg: merge subdirs, split master/node #305

Closed danwinship closed 8 years ago

danwinship commented 8 years ago

The plugins/osdn vs plugins/osdn/ovs split was based on the idea that the code in plugins/osdn would eventually also be used by other plugins. Given that this is no longer expected to happen, there's no point in keeping the split.

OTOH, we do want to be able to split the master and node code apart more easily, and that's easier to do once everything is merged together, and that's what the second part of this branch does.

@openshift/networking PTAL. You'll probably want to review commit-by-commit.

pravisankar commented 8 years ago

We changed openshift-sdn-docker-setup.sh and openshift-sdn-ovs paths, need to update origin.spec and contrib/node/install-sdn.sh on the origin repo.

danwinship commented 8 years ago

Updated. I moved the constants into plugins/osdn/api/ rather than pkg/, since that seemed to be consistent with the rest of what we're doing.

Corresponding origin branch is "merge-and-split" in danwinship/origin

dcbw commented 8 years ago

LGTM

danwinship commented 8 years ago

Repushed with:

I guess this should probably wait until after #303 though

pravisankar commented 8 years ago

Merge plugins/osdn/ovs into plugins/odsn

typo *osdn

pravisankar commented 8 years ago

Good cleanup/reorg, LGTM

danwinship commented 8 years ago

@openshift/networking updated; I ran the extended networking tests locally, but you might want to wait for the origin PR to finish the other tests before merging this

danwinship commented 8 years ago

btw @pravisankar my version of this rebased on top of #303 is danwinship:merge-and-split-303, though that's based on an earlier version of this branch, and also I never tried compiling it, so it probably has bugs

danwinship commented 8 years ago

dropped "Move plugin name constants into plugins/osdn/api/" since those constants are no longer used outside of openshift-sdn after Ravi's addition of IsOpenShiftNetworkPlugin() and IsOpenShiftMultiTenantNetworkPlugin().

dcbw commented 8 years ago

LGTM

pravisankar commented 8 years ago

LGTM