Commit graph

366 commits

Author SHA1 Message Date
Jana Radhakrishnan
c3d02744c6 Cleanup libnetwork test code
- The libnetwork test code had some issues in not properly
  passing the network options. Fixed it.
- Made controller a global value so that every test uses the
  same controller instance.
- Cleaned up endpoint and network objects after every test.
- Extended the endpoint join test case to test the same container
  join two different networks using two different endpoints.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-03 17:48:38 -07:00
Jana Radhakrishnan
ea8580d1e2 Remove only the endpoint owned interfaces
Only remove the interfaces owned by the endpoint from
the sandbox when the container leaves the endpoint.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-03 17:14:44 -07:00
aboch
0d2632e0e2 Merge pull request #240 from Metaswitch/remote-driver-static-routes
Add static routes to the remote driver.
2015-06-03 16:51:56 -07:00
Tom Denham
5c153bd018 Add static routes to the remote driver.
Signed-off-by: Tom Denham <tom.denham@metaswitch.com>
2015-06-03 16:31:21 -07:00
Jana Radhakrishnan
944a1cd026 Merge pull request #238 from WeiZhang555/clean
cleanup: remove unused variable
2015-06-03 14:45:59 -07:00
aboch
eeb156c778 Merge pull request #241 from Metaswitch/remote-driver-dstprefix
Update remote driver to use destination prefix.
2015-06-03 14:40:36 -07:00
aboch
5906671db5 Merge pull request #232 from Metaswitch/link-routes
Change scope to LINK when setting device routes
2015-06-03 14:27:44 -07:00
Tom Denham
5ad02e8c48 Change scope to LINK when setting device routes
Without this they don't have the desired effect.
The default when creating these types of routes with ip route add is link - the old setting of universe was just wrong.

Signed-off-by: Tom Denham <tom.denham@metaswitch.com>
2015-06-03 13:34:00 -07:00
aboch
927b19fa4b Merge pull request #237 from kunalkushwaha/json-tagged-struct
API struct tagged to produce proper output when marshalled #217
2015-06-02 16:44:27 -07:00
Madhu Venugopal
17919459c5 Merge pull request #236 from mrjana/cnm
Remove container data return value from Join
2015-06-02 16:12:22 -07:00
Madhu Venugopal
c9a85db947 Merge pull request #220 from jhowardmsft/10662-compile
Windows: Enable compile
2015-06-02 16:06:50 -07:00
Jana Radhakrishnan
c41c18a295 Merge pull request #246 from mavenugo/rb
Cherry-picking commits from docker_1.7.0_integ into master
2015-06-02 16:03:49 -07:00
Jana Radhakrishnan
848f4358e9 Merge pull request #245 from crosbymichael/no_log
Do not warn in packages
2015-06-02 15:58:04 -07:00
Madhu Venugopal
0ae84dad55 Fixes https://github.com/docker/docker/issues/13426
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-02 15:50:38 -07:00
Jana Radhakrishnan
bc70ed60cb Fix miscellaneaus data races
Fixed the remaining data races in the libnetwork code.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-02 15:50:00 -07:00
Jana Radhakrishnan
61993ec6c2 Modprobe bridge driver r specific kernel modules
Try too modprobe bridge driverer specic modulein case
they are not loaded into the kernel.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-02 15:49:45 -07:00
Jana Radhakrishnan
db5f2f40fb Removee the init time cleanup of namespace files
Removing this as this may cause problems when
multiple instances are e running.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-02 15:49:05 -07:00
Jana Radhakrishnan
7560ca63f5 Reworkkgarbage collection code to use tick
Instead of sleeping reworked the code to use recurring ticks.
Also cleaned up unnecessary defers.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-02 15:48:56 -07:00
Jana Radhakrishnan
f429a2528d Loopback interface not t brought up
Loopback interface was s not brought up when wemoved
to clone method of creating namespace. e. Adding it.
Also taking care of PR R comments.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-02 15:48:48 -07:00
Jana Radhakrishnan
3ec19ff62b Workaround kernel bugs s related to namespaces
This PR attempts to work around bugs present in kernel
version 3.18-4.0.1 relating to namespace creation
and destruction. This fix attempts to avoid certain
systemmcalls to not get in the kkernel bug path as well
as lazily garbage collecting the name paths when they are removed.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-02 15:46:03 -07:00
Michael Crosby
96295af687 Do not warn in packages
Do not have log output in packages that applications consume because the
output can mess with logs, stdout/stderr of applications and such and
there is nothing that the consumer can do about it other than change the
package that they are using.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-02 15:11:32 -07:00
Jana Radhakrishnan
d1d854e5da Merge pull request #244 from aboch/sc
Fix dnet service cli help o/p
2015-06-02 15:10:54 -07:00
Alessandro Boch
ce64bdbd9f Fix dnet service cli help o/p
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-02 14:25:47 -07:00
Jana Radhakrishnan
5169fdaa3f Merge pull request #243 from dave-tucker/cleanup
Remove dead code
2015-06-02 13:46:53 -07:00
Dave Tucker
8ec7f0d7ac Remove dead code
Sir Codus Cleanupus vs. system.go

"This code doth offend me so" uttered Sir Codus Cleanupus
"and thus it must be cleft swiftly in twain". With one hefty
stroke of his broadsword he carved the old, unfunctioning
code in half and thus it ceased to be.

Signed-off-by: Dave Tucker <dt@docker.com>
2015-06-02 18:21:04 +01:00
Tom Denham
3c0d5c3a8b Update remote driver to use destiantion prefix.
Required since #193

Signedeoff-by: Tom Denham <tom.denham@metaswitch.com>
2015-06-01 15:35:57 -07:00
Zhang Wei
12117f349d cleanup: remove unused variable
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-06-01 18:50:20 +08:00
Madhu Venugopal
c3be099b1d Merge pull request #235 from mrjana/maintainer
Add Alessandro as a libnetwork maintainer
2015-06-01 02:17:10 -07:00
Madhu Venugopal
0bec6a3ae1 Merge pull request #233 from WeiZhang555/typo
fix typo
2015-05-30 14:36:24 -07:00
Kunal Kushwaha
3ed8beaa4b json friendly struct field in API structure
Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
2015-05-30 07:28:50 +09:00
Jana Radhakrishnan
800029abb6 Remove container data return value from Join
Now that Endpoint interface has the Info method there is no
need to return container data as a return value in the Join
method. Removed the return value and fixed all the callers.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-29 20:11:02 +00:00
Jana Radhakrishnan
930d27c06c Add Alessandro as a libnetwork maintainer
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-29 18:46:33 +00:00
Zhang Wei
a4de736345 fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-29 16:31:12 +08:00
Madhu Venugopal
364138bf2e Merge pull request #180 from Metaswitch/driver-routes
Add ability for drivers to set static routes
2015-05-27 11:19:18 -07:00
John Howard
d56c6de9b2 Windows: Enable compile
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 10:46:21 -07:00
Tom Denham
65acaaf0b5 Allow drivers to supply static routes for interfaces
Signed-off-by: Tom Denham <tom.denham@metaswitch.com>
2015-05-25 19:25:30 -07:00
Jana Radhakrishnan
db7178a675 Merge pull request #188 from mavenugo/kvstore
Host Discovery, DataStore & Config support
2015-05-25 17:54:20 -07:00
Madhu Venugopal
ae8643748d Libnetwork Host Discovery using Swarm Discovery pkg
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:40 -07:00
Madhu Venugopal
ef1293ce5a Updating Godep to pull in Set functionality
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:40 -07:00
Madhu Venugopal
481568035f TOML based Configuration support for libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:40 -07:00
Madhu Venugopal
8324230320 Godeps for TOML parser - BurntSushi
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:40 -07:00
Madhu Venugopal
594361552e Avoid adding local reserved networks (bridge, none, host) to the datastore
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:39 -07:00
Madhu Venugopal
87161e8935 Added Network Watch support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:39 -07:00
Madhu Venugopal
9b952fc982 Initial kv store integration and datastore implementation
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:29:34 -07:00
Madhu Venugopal
c46a023902 Updating Godep to reuse Swarm discovery and store packages
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-25 16:03:33 -07:00
Jana Radhakrishnan
493aa86c66 Merge pull request #213 from baoyonglei/bugfix
Fix createTestNetwork bug
2015-05-25 10:14:40 -07:00
Jana Radhakrishnan
22449f5358 Merge pull request #215 from fmzhen/test-dev
fixed some typos
2015-05-25 10:08:08 -07:00
Mingzhen Feng
9c9c79f1b0 fixed some typos
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
2015-05-25 21:08:53 +08:00
Jana Radhakrishnan
31404b26aa Merge pull request #209 from mavenugo/fixapi
Added API support for both /vx.x/networks & /networks
2015-05-24 21:37:41 -07:00
Jana Radhakrishnan
26588b476b Merge pull request #172 from junxu/master
Fix RemoveInterface in sandbox
2015-05-24 20:12:24 -07:00