Commit Graph

724 Commits

Author SHA1 Message Date
Madhu Venugopal e6208d308c Merge pull request #543 from tomdee/settings-routes-after-up
Set interfaces routes after the interface is up
2015-09-17 18:02:41 -07:00
Tom Denham 3784b194a0 Set interfaces routes after the interface is up
Fixes #485

The code previously relied on an uninteded side effect. When the
interface name was set, this causes the interface to come up
prematurely. Once that side effect was removed, routes could
no longer be set.

This change ensures that routes are only set after the interface
is brought up.

Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2015-09-17 16:05:25 -07:00
aboch e854ae3151 Merge pull request #540 from estesp/fix-dir-perms
Correct perms for directory creation
2015-09-17 12:58:13 -07:00
Jana Radhakrishnan 51abe69a24 Merge pull request #541 from estesp/ignore-update
Add cmd/dnet/dnet binary to .gitignore
2015-09-17 12:29:13 -07:00
Phil Estes 6817d63ad2 Add cmd/dnet/dnet binary to .gitignore
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-09-17 15:21:17 -04:00
Phil Estes 9e400ad567 Correct perms for directory creation
Directories should be 0755, not 0644

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-09-17 15:19:23 -04:00
Madhu Venugopal b3ed725873 Merge pull request #537 from mrjana/integ
Introduce test remote plugin in dnet
2015-09-17 11:34:02 -07:00
Jana Radhakrishnan a2f832fdb4 Introduce test remote plugin in dnet
There are multiple goals of introducing test driver plugin
  - Need a driver which can be configured to simulate
    different driver behaviors
  - For pure libnetwork multi-host integration testing
    a test driver configured for global scope can be used
    without trying to use a real driver like overlay
    which comes with it's own dependencies which can't
    be satisfied all enviroments(I am looking at you
    circleci)

This PR also makes all test cases that we have so far to be run
in circleci without any skipping needed.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-17 10:38:34 -07:00
Madhu Venugopal db49da8521 Merge pull request #534 from aboch/t
Make integration-tests an indipendent target
2015-09-17 08:45:36 -07:00
Alessandro Boch 3f99dc594a Make integration-tests an indipendent target
- Also add target for cleaning up dnet binary

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-17 08:27:20 -07:00
Madhu Venugopal b85c321af0 Merge pull request #462 from chenchun/data_store
Fix for zookeeper backend
2015-09-17 03:20:02 -07:00
Chun Chen d35f6502f6 Fix for zookeeper backend
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-09-17 10:16:34 +08:00
Madhu Venugopal 00a92f066e Merge pull request #536 from mrjana/bugs
Fix unmarshal error in endpoint interface
2015-09-16 14:42:44 -07:00
Jana Radhakrishnan 785ef1786c Fix unmarshal error in endpoint interface
Instead of passing the pointer to &ep.iface the current
code is passing the value. So the source variable is not
getting updated properly.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-16 13:54:29 -07:00
Madhu Venugopal e5cb24b990 Merge pull request #529 from mrjana/integ
Add more integration tests
2015-09-16 10:32:47 -07:00
Jana Radhakrishnan c8c693c94f Add simple integration test cases
- Enhance dnet to use codegansta/cli as the frontend
    - Add `container create/rm` commands only in dnet
    - With the above dnet enhancements add more integration tests

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-16 09:17:32 -07:00
Madhu Venugopal 927d276590 Merge pull request #532 from chenchun/update_libkv
Update libkv to latest commit
2015-09-16 03:46:29 -07:00
Chun Chen feb25a9dc4 Update libkv to latest commit
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-09-16 18:20:26 +08:00
Jana Radhakrishnan cc5664361c Update Godeps and add codegangsta/cli
Updated Godeps and added codegangsta/cli into Godeps.
Also cleaned up the unnecessary packages by removing
host_discovery build tag which wasn't getting detected
by godep and was causing all sorts of `godep save` issues.
With this fix committers can do `godep save ./...` freely
to include their new dependencies without any failure.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-15 22:22:28 -07:00
Madhu Venugopal 30875848d4 Merge pull request #516 from WeiZhang555/localscope
Add negotiation process for driver scope
2015-09-15 02:43:45 -07:00
Zhang Wei a20a1a4e2c Add negotiation process for driver scope
Add one capability negotiation interaction after plugin handshake, use
this to determine plugin's capability instead of default "global" scope.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-09-15 16:45:38 +08:00
Jana Radhakrishnan 2baa2ddc78 Merge pull request #521 from aboch/cu
Cleanup external sandbox from test
2015-09-11 14:43:08 -07:00
Alessandro Boch 44763fa166 Cleanup external sandbox from test
- otherwise "ValidKey" file is left behind

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-11 14:35:45 -07:00
Jana Radhakrishnan 65406ce6f4 Merge pull request #520 from aboch/vd
Limit valid object names
2015-09-11 11:42:13 -07:00
Jana Radhakrishnan 1853ae0e4a Merge pull request #515 from mavenugo/uds_uns
External key handling via reexec
2015-09-11 11:38:20 -07:00
Madhu Venugopal 6175353964 Reexec external key handling
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-09-11 11:23:40 -07:00
Alessandro Boch a426c01859 Limit valid object names
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-11 11:02:16 -07:00
aboch e757ba284c Merge pull request #508 from mrjana/mintf
Remove multiple interface in an endpoint
2015-09-11 09:29:24 -07:00
Madhu Venugopal 21047d8215 Godeps update on libcontainer
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-09-11 09:20:16 -07:00
Jana Radhakrishnan a3db98ec00 Remove multiple interface in an endpoint
Currently the endpoint data model consists of multiple
interfaces per-endpoint. This seems to be an overkill
since there is no real use case for it. Removing it
to remove unnecessary complexity from the code.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-11 09:19:01 -07:00
Madhu Venugopal 614f396bee Merge pull request #510 from aboch/sc
Make lookupSandboxID() reliable
2015-09-10 06:12:31 -07:00
Jana Radhakrishnan 1c6825da9a Merge pull request #512 from chenchun/fix_bug
Fix CI failure due to mistaken imports
2015-09-09 22:42:26 -07:00
Chun Chen f866884ed4 Fix CI failure due to mistaken imports
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-09-10 13:31:17 +08:00
Jana Radhakrishnan 71bce3e4d6 Merge pull request #502 from mavenugo/sbox_uns
Support to provide external key to sandbox
2015-09-09 21:39:48 -07:00
Madhu Venugopal 4aaa815eaf Support to provide external key to sandbox
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-09-09 20:26:37 -07:00
Alessandro Boch 9e7149743a Make lookupSandboxID() reliable
- it is supposed to be called after lookupContainerID()
  but the latter is not guaranteed to succeed and in
  case of connection error will return what was passed
  to it.
  So in order to be able to operate with both long and short
  container ids in case of lookupContainerID() failure,
  always search by `partial-container-id`

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-09 18:24:53 -07:00
Jana Radhakrishnan 424f792659 Merge pull request #509 from aboch/pc
Remove stale consul container first
2015-09-09 18:18:33 -07:00
Alessandro Boch 464bcf3370 Remove possible stale containers first
- So test will not fail because container is already there
  Prefer this to re-use the containers as it would contain
  states from last run
- A stale consul or dnet container condition will happen
  in case the previous integ test run aborted

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-09 18:00:18 -07:00
Madhu Venugopal 7bfa0793c1 Merge pull request #503 from mrjana/bugs
Add integration test infra
2015-09-09 12:20:07 -07:00
Jana Radhakrishnan c37777e6b3 Merge pull request #505 from mountkin/remove-useless-code
remove the useless get netns code in createNetworkNamespace
2015-09-09 08:47:05 -07:00
Shijiang Wei 0e0e6a2b82 remove the useless get netns code in createNetworkNamespace
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-09-09 23:21:10 +08:00
Madhu Venugopal c932bc4cc5 Merge pull request #504 from tmakita/fix-service-detach
Fix inability to detach service
2015-09-09 02:24:20 -07:00
Jana Radhakrishnan a017a14420 Add integration test infra
Currently libnetwork does not have any integration test infra
support to tests libnetwork code end2end purely as a black
box. This initial commit adds the infra support to enable
test cases for this.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-08 22:58:12 -07:00
Toshiaki Makita a3d02dea09 Fix inability to detach service
CmdServiceDetach() incorrectly uses containerID where sandboxID is
expected. Thus, procDeleteSandbox() fails to find the corresponding
sandbox and returns the "Resource not found" error.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
2015-09-09 10:10:11 +09:00
aboch 491e5f075a Merge pull request #501 from tmakita/fix-sandboxes-api
Add missing sandboxes routes
2015-09-08 07:22:33 -07:00
Toshiaki Makita f15b90662e Add missing sandboxes routes
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
2015-09-08 15:30:47 +09:00
Madhu Venugopal 3e31cead05 Merge pull request #500 from mrjana/bugs
Fix CI failure due to conflicting merges
2015-09-07 19:43:16 -07:00
Jana Radhakrishnan ac8fb2cf9f Fix CI failure due to conflicting merges
There were two pending PRs with package level
changes but no source level conflicts. This got
merged because git cannot detect this.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-07 19:35:39 -07:00
Jana Radhakrishnan ba8b3c862d Merge pull request #498 from WeiZhang555/bug
Fix bug for `docker service ls`
2015-09-07 19:21:38 -07:00
Zhang Wei 6c9aafa00b Fix bug for docker service ls
fix bug for `docker service ls` error:
"Failed to retrieve backend list for service xxx (json: cannot
unmarshal object into Go value of type []client.sandboxResource)"

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-09-08 09:37:35 +08:00