Skip to content

Latest commit

 

History

History
150 lines (119 loc) · 8.01 KB

CONTRIBUTE.md

File metadata and controls

150 lines (119 loc) · 8.01 KB
Raw

Contribute

If you want to contribute source code to pysdn then please read this document, it describes how to contribute your code to pysdn.

Why

Why would you want to contribute source code?

  • You have a bug fix
  • You have a new feature
  • You have some ideas

Will my contribution be accepted by the maintainer(s)

Typically the answer to this question is, "Hurray! Yes! Thank you! Definitely!" But lets communicate with the community to be sure there is no duplicate effort or that what you want to do is not a new github project altogether:

  • If you contribute a bug fix then please find or create an issue first (go to the github page for this repository and use the github issues page, on right margin). This is to

    1. track the issue
    2. be sure it is a bug (and not a misunderstanding of a feature)
    3. be sure it is not already being worked on

  • If you contribute a new feature it should match the goal/scope of this project: provide Python developers a Python library of classes to more easily work with Brocade's OpenDaylight Controller. This is to avoid feature creep and ensure that there are opportunities for others to build new github repositories with libraries and apps atop this library.

  • If something drives you nuts about using the API then log it as an issue and then see bug fix above.

  • If you have ideas for a better internal software design/architecture, log it as an issue so we can discuss it.

  • In general, it is better to communicate with us before launching into a large modification. We prefer to communicate publicly so that all users can participate if they so choose. Please go to the github page for this repository and use the github issues page.

Legal Stuff:

When you do your first pull request we will ask you to sign a contributor license agreement (CLA). This is to ensure that we can keep pysdn open source for everyone. We thought that this StackOverflow answer did a good job describing the reasons for CLA: http://programmers.stackexchange.com/questions/168020/how-signing-out-a-cla-prevents-legal-issues-in-open-source-projects

How do I contribute:

  1. First, read the 'Will my contribution be accepted by the maintainer(s)' section above.
  2. We use the Fork & Pull methodology for pull requests as described here: https://help.github.com/articles/using-pull-requests/
    1. There is a good beginner video (by Ashley Grant) here as well: https://www.youtube.com/watch?v=M7ZYkjOWr6g

Do this once

  1. Fork this repository.

    1. Go to this repository's home page in Github and then in the top right corner find the 'Fork' button and click it.

  2. Go to the newly forked repository's home page (in your Github account) and get its clone URL (on right margin)

  3. On your laptop open a command window and clone your fork of the project

    git clone <clone url of your fork of the project>

  4. Change into the directory created

  5. Set your local repo to track the original repository

    git remote add upstream <clone url for the original project>

Do this everytime you begin a new feature

  1. Never, Never, NEVER make changes in this master branch on your laptop. It will always be your copy of the original project and should never have changes you make. You will make your changes in feature branches. You may have only one feature branch or you may have multiples, depending on how many changes you are going to request be made to the original project.

  2. In your console window in the forked project, change to the 'master' branch.

    git checkout master

  3. Now, 'rebase' your master to the upstream master branch of the original project (not your fork). This basically will make your local master branch match exactly what is on the remote master of the original project.

    git pull --rebase upstream master

  4. Create a feature branch for an issue/feature that you are writing code to address. For instance if you have two bug fixes and a new feature then each of those would have an associated github issue and each would be repaired in its own feature branch (so you would have three (3) feature branches). That way each change has an associated issue to track it and if one of your pull requests takes a long time to resolve and get into the original project the other ones can still get in quickly.

    git checkout -b <name of your feature branch>

  5. That command will create the branch and move you into that branch. Always double check which branch you are in...to avoid making changes in the wrong branch.

    git branch

  6. Send the new (local) feature branch to Github and connect that (remote) feature branch to this local branch

    git push --all -u

  7. If you are in the correct feature branch, then go ahead and make the changes to the source files that you want to make.

    1. Before making changes always be sure you are in the correct branch
    git branch

    1. Feel free to inform git about your changes to your local feature branch

      git add <filename>

    2. Feel free to commit your changes to your local feature branch

      git commit -m "A reasonable sentence describing your changes"

    3. Feel free to push your changes to your remote feature branch

      git push

Do this when you are ready to submit your changes

  1. Once you are happy with your changes run the unit tests to validate the system continues to work correctly (unit tests coming soon)
  2. Once the unit tests work add, commit and push all your changes to your remote feature branch (see above)
  3. Once all your changes are pushed you are ready to do a pull request
  4. Open your browser and go to your fork of the project (not the original), find your feature branch and do a compare and pull request
  5. If the pull request is able to be merged automatically then go ahead and create the pull request
  6. If the pull request cannot be merged automatically then see 'How do I rebase?' below and then come back here and try again.

How do I rebase?

  1. Sometimes your pull request cannot be merged automatically or the maintainer responds to your pull request with 'please rebase and try again'. Basically this means that other changes (pull requests) have slipped in front of you and your request can no longer be merged automatically. This section describes how to do this.

  2. This works only if you Never, Never, NEVER make changes in your fork's master branch and only make changes in the feature branches.

  3. In your console window in the forked project, change to the 'master' branch.

    git checkout master

  4. Now, 'rebase' your master to the upstream master branch of the original project (not your fork). This basically will make your local master branch match exactly what is on the remote master of the original project.

    git pull --rebase upstream master

  5. Now, change back to your feature branch

    git checkout <feature branch name>

  6. Rebase your feature branch to your local master branch. This will make your feature branch identical to your local master branch and then replay all of the changes you made on your feature branch on top of this.

    git rebase master

  7. Check the output of the last command. Did you get CONFLICT messages? If yes, then you need to open the files that had CONFLICT, look at them and figure out how to merge the conflicts. The conflicts will be marked in the files. The CONFLICT areas will begin with <<<<< and end with >>>> In between these will be your original text and the text from the current project.

  8. Once you resolve all the conflicts and run the unit tests (coming soon) you are ready to finish the rebase:

  9. Inform git about all the files you changed by doing a git add for each

    git add <filename of files changed>

  10. Let git know that you have completed fixing the CONFLICT and it should continue the rebase

    git rebase --continue

  11. Force push your changes

    git push --force

  12. You have rebased. Go back to the previous section and try sending your pull again.