1123 Commits

Author SHA1 Message Date
Michael Cambria
3072177d0e Merge branch 'issue164' of github.com:mccv1r0/plugins into issue164 2018-10-10 12:32:34 -04:00
Michael Cambria
d2ebd0a4c2 Merge branch 'master' of github.com:containernetworking/plugins into issue164 2018-10-10 12:28:43 -04:00
Dan Williams
f879dad626
Merge pull request #207 from mccv1r0/vendorfix
Fix vendor regression in dhcp4server
2018-10-10 10:50:53 -05:00
Michael Cambria
22b11bb367 Keep defaultSocketPath the same as before 2018-10-10 11:35:57 -04:00
Michael Cambria
396f51afab Merge branch 'vendorfix' of github.com:mccv1r0/plugins into vendorfix 2018-10-09 16:59:01 -04:00
Michael Cambria
73106f0ece Remove unused pidfilePath const
Moved global var's to BeforeEach()
2018-10-09 16:57:58 -04:00
Michael Cambria
bf31f08981 Remove unused pidfilePath const 2018-10-09 16:39:06 -04:00
Michael Cambria
75e35b6c01 Added new test cases.
Add two interfaces (e.g. eth0, eth1) to the same container.
Ensure each file now has ContainerID and ifname.
Delete one, ensure that the right file was deleted.

Add an interface using just ContainerID in the file.
Delete to verify we are still backwards compatible with any
files created using earlier verison of host-local plugin.
2018-10-09 13:13:36 -04:00
Michael Cambria
37715a0f87 Moved directory walk, compare file code to it's own function 2018-10-09 13:13:36 -04:00
Michael Cambria
a17cadda88 Handle the case of a Delete for a reservation stored with just ContainerID without the interface 2018-10-09 13:13:36 -04:00
Michael Cambria
1e8f9525a6 Obtain ifname from CmdArgs and pass to backend Add ifname to second line of file tracking the IP address used by ContainerID
Update host-local tests to use ifname along with ContainerID
in store file

Signed-off-by: Michael Cambria <mcambria@redhat.com>
2018-10-09 13:13:36 -04:00
Michael Cambria
ef913eadd5 Took out os.Remove() for socketPath and pidfilePath now that os.RemoveAll() is used 2018-10-08 16:01:31 -04:00
Michael Cambria
3d349e4645 Ensure /run/cni exists in the filesystem before running dhcp tests 2018-10-08 14:08:37 -04:00
Michael Cambria
3de323f3f0 Enable ginkgo parallelization in test.sh 2018-10-08 11:32:08 -04:00
Michael Cambria
5fd849ac6d Use tempDir in socket path for ginkgo parallelization 2018-10-08 11:31:03 -04:00
Michael Cambria
6d3215a256 Allow socket path used by dhcp plugin to be supplied via dhcp ipam configuration
Allow socket path to be supplied as flag when starting dhcp daemon
2018-10-08 11:30:01 -04:00
Gabe Rosenhouse
726759b29b
Merge pull request #209 from angelachin/readme-bandwidth-update
Updated README to include bandwidth plugin
2018-10-05 10:02:21 -07:00
Michael Cambria
66837d6f3b Remove -p from test.sh
Running ginkgo tests in parallel causes problems with dhcp_test.go.

BeforeEach() is run once for each spec before any actual dhcp test starts.
This results in setting up two dhcp4servers that run concurrently.
Both try to Listen and use unix socketPath file /run/cni/dhcp.sock at the same time.

AfterEach() for one test runs when test completes, deleting /run/cni/dhcp.sock.
But other test still needs the file resulting in test failing.  Often, the next dhcp
test hasn't started yet.  When test does start it waits 15 seconds for dhcp4server to
create /run/cni/dhcp.sock (which has just been deleted) so test fails.

Other times dhcp tests fail because /run/cni/dhcp.sock is deleted while still being used.
2018-10-01 16:12:07 -04:00
Michael Cambria
1e4d47fc35 Fix vendor regression in dhcp4server 2018-09-27 11:04:14 -04:00
Michael Cambria
0fbc611121 Added new test cases.
Add two interfaces (e.g. eth0, eth1) to the same container.
Ensure each file now has ContainerID and ifname.
Delete one, ensure that the right file was deleted.

Add an interface using just ContainerID in the file.
Delete to verify we are still backwards compatible with any
files created using earlier verison of host-local plugin.
2018-09-25 16:17:18 -04:00
Michael Cambria
9959f787e8 Moved directory walk, compare file code to it's own function 2018-09-25 12:10:36 -04:00
Dan Williams
646dbbace1
Merge pull request #165 from s1061123/dev/static-args
Support CNI_ARGS in static IPAM plugin
2018-09-24 21:00:09 -05:00
Dan Williams
9b86f52791
Merge pull request #200 from s1061123/fix/tuning-doc
Add description for mac/mtu/promisc in tuning README.md
2018-09-24 20:53:38 -05:00
Dan Williams
8a579a7fbc
Merge pull request #204 from mrostecki/always-check-err
Add missing error checks
2018-09-24 20:52:38 -05:00
Dan Williams
a8ad12dd7a
Merge pull request #193 from thxCode/windows_cni
Windows CNI support
2018-09-20 15:16:52 -05:00
MaiWJ
b56ca2fe45 Windows Support
Patch for https://github.com/containernetworking/plugins/pull/85

+ Windows cni plugins are added
   (*) win-bridge (hostgw)
   (*) win-overlay (vxlan)
+ Windows netconf unit test
+ Fix appveyor config to run the test
+ Build release support for windows plugins

Address comments

From:
    - https://github.com/containernetworking/plugins/pull/85
    - 0049c64e3f
2018-09-21 00:34:07 +08:00
MaiWJ
e1d29e9fe4 Update Vendor
(*) github.com/Microsoft/hcsshim
    (*) golang.org/x/sys
    (*) github.com/x/cyrpto
    (*) github.com/sirupsen/logrus
    (*) github.com/Microsoft/go-winio
    (*) github.com/juju/errors
    (*) github.com/buger/jsonparser
2018-09-21 00:34:07 +08:00
Michael Cambria
7b72f2afd4 Handle the case of a Delete for a reservation stored with just ContainerID without the interface 2018-09-20 10:56:07 -04:00
Tomofumi Hayashi
93178bf026 Fix typo. 2018-09-20 22:18:15 +09:00
Michal Rostecki
f5f787057d plugins/meta: Add missing error checks
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:06:50 +02:00
Michal Rostecki
8c61a2c2f3 plugins/main: Add missing error checks
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:06:28 +02:00
Michal Rostecki
1a3f49c7ae plugins/ipam: Add missing error check
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:05:58 +02:00
Michal Rostecki
947a5881fc pkg/ns: Add missing error checks
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:05:15 +02:00
Michal Rostecki
26834c3e63 pkg/ip: Add missing error check
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:04:13 +02:00
Michael Cambria
f1ee2cc614 Obtain ifname from CmdArgs and pass to backend Add ifname to second line of file tracking the IP address used by ContainerID
Update host-local tests to use ifname along with ContainerID
in store file

Signed-off-by: Michael Cambria <mcambria@redhat.com>
2018-09-18 16:35:30 -04:00
Tomofumi Hayashi
d22e75316f Incorporate comments in PR. 2018-09-13 01:49:47 +09:00
Tomofumi Hayashi
094c903932 Incorporate Dan's comments. 2018-09-13 01:46:11 +09:00
Tomofumi Hayashi
61a412ea77 Align test suite name with others 2018-09-06 15:56:40 +09:00
Tomofumi Hayashi
61c136126f Support multiple IP addresses in CNI_ARGS 2018-09-06 15:50:18 +09:00
Dan Williams
35b87a34db
Merge pull request #191 from dcbw/portmap-panic-fix
portmap: don't panic if listing a chain returns fewer lines than exected
2018-09-05 10:09:02 -05:00
Tomofumi Hayashi
9048a61dda Add description for mac/mtu/promisc in tuning README.md
This diff adds documents for #177 change (mac/mtu/promisc) in tuning
README.md. Fixes #199.
2018-09-05 16:01:24 +09:00
Tomofumi Hayashi
321467bf1b Merge remote-tracking branch 'upstream/master' into dev/static-args 2018-09-05 14:39:16 +09:00
Tomofumi Hayashi
60a99ca331 Incorporate Dan's comments. 2018-09-05 14:37:31 +09:00
Dan Williams
7d329215b0 portmap: don't panic if listing a chain returns fewer lines than expected 2018-08-16 09:50:28 -05:00
Matt Dupre
6a12a375cd
Merge pull request #190 from dongjun666/bandwidth_desc
Correct the bandwidth unit in description
2018-08-15 17:00:24 +01:00
Dong Jun
220499db6b Correct the bandwidth unit in description
Replace Kbps with bps and Kb with bits in bandwidth description.
2018-08-15 19:26:13 +08:00
Dan Williams
5532950dce
Merge pull request #186 from ncdc/fix-release-no-tty
scripts: support building releases without a TTY
2018-08-14 13:22:27 -05:00
Dan Williams
fb7a24405e
Merge pull request #177 from s1061123/tuninig-iplink
tuning: add some generic link settings (MAC, promisc, MTU)
2018-08-14 13:22:10 -05:00
Andy Goldstein
9689522b4f
scripts: support building releases without a TTY
This allows systems such as Jenkins, which do not provide a TTY, to run
scripts/release.sh

Signed-off-by: Andy Goldstein <andy.goldstein@gmail.com>
2018-08-09 10:20:40 -04:00
Tomofumi Hayashi
9425d24c28 Incorporate @jelloneck/@bboreham/@squeed's comments. 2018-08-09 22:28:12 +09:00