Merge master into release-1.1 #1044
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Erik Hollensbe <[email protected]>
Signed-off-by: Erik Hollensbe <[email protected]>
Reorganize objdb and add basic consul support
Create README.md
Fix make test
Fix a typo Merging this small change in a hurry so that I can pick it up in netplugin
move mutex to global level
Get current lock holder by reading from statestore
Signed-off-by: Sukhesh Halemane <[email protected]>
Move away from using etcd modifiedIndex in compare-and-swap
Signed-off-by: Erik Hollensbe <[email protected]>
etcdService.go: add error checks for host parsing in service watch
Signed-off-by: Erik Hollensbe <[email protected]>
Adding debugs in netplugin/scripts/build.sh
Signed-off-by: Bill Robinson <[email protected]>
Without this patch, when a node first time start netplugin, and if there wasn't netmaster started ever on the node, the ovs logging directory will not exist and no logging will be able to be found. This patch makes sure the ovs logging directory created before service starts. Also added a wait step before ovsdb ready, and logging level. changes the indentation to 4 spaces and make codes more readable Signed-off-by: Wei Tie <[email protected]>
* Removed GOPATH check Signed-off-by: Vikram Hosakote <[email protected]> * Removed doc Signed-off-by: Vikram Hosakote <[email protected]>
etcdClient.go: fixed a bug where nil was returned instead of err
'devbuild' moniker is not needed, that is a contiv/install default convention Simplify the tag name to just the SHA, which ties the image tag to the actual contents, and not be variable based on a build time environment variable * Added some comments * compile-with-docker was not using the tag variable Signed-off-by: Chris Plock <[email protected]>
…spell` was complaining about it Signed-off-by: Bill Robinson <[email protected]>
Signed-off-by: Bill Robinson <[email protected]>
Subtree objdb repo into netplugin
Signed-off-by: Bill Robinson <[email protected]>
objdb/modeldb/modeldb.go: fix import path
…db import paths This also pulled in the changes from contiv-experimental/contivmodel#68 which had not previously been included. Signed-off-by: Bill Robinson <[email protected]>
Signed-off-by: Bill Robinson <[email protected]>
image tag is just sha, rm 'devbuild' default
Godeps,vendor: update contivmodel to the latest version + use new objdb import paths
There are no vendored changes with this commit. This is necessary to resolve an issue with Godeps where it barfs on dependency detection because "client-go" had an empty Godeps.json Signed-off-by: Bill Robinson <[email protected]>
Godeps/Godeps.json: update client-go version
Signed-off-by: Bill Robinson <[email protected]>
objdb: remove now-unused Makefile and Vagrantfile
…nore Signed-off-by: Vikram Hosakote <[email protected]>
Remove test/systemtests/cfg.json so that it will be ignored
Prepare for new CI
Signed-off-by: Ranjith <[email protected]>
* Contiv network is not deleted when docker network is deleted Steps to reproduce: 1. Create a docker network with docker network CLI 2. Ensure docker network and contiv network are created (docker network ls and netctl network ls) 3. Remove docker network. 4. Check docker network ls, docker network is deleted 5. Check netctl networ ls, contiv network is still test. The root cause is due to the dockernetworkstate mapping is planned to delete after contiv network is delete. However, the determination of contiv network deletion is determined by the existance of the dockernetworkstate. Thefore, if the state is still there, the contiv network will be unable to delete. The fix is to delete the dockernetworkstate before proceed to contiv network deletion Signed-off-by: Kahou Lei [email protected] * Print out error * Add unit test and also refactor some code to make the code more testable. * Add more unit test and fix typos * Add more testing * Add key value pair in fake state * Refactor base on comments * Add more check in unit test. Take out return statement when docker network is not there.
support ip-ip policy in EPG.
Signed-off-by: Vikram Hosakote <[email protected]>
Adding test/systemtests/cfg.json.example
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.