Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt new version of docker #47

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conversation

liuliuzi
Copy link

1,Modkify dknet to go-plugins-helpers, it seems the dknet API is not compatible new version ( such as 1.13) docker plugin‘s API formate.
2,Plugin could get exist network create by this driver even plugin restart

Copy link

@huikang huikang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this PR is valid for testing the ovs-plugin with docker 1.13. Thanks.

//recover networks
netlist,err :=d.dockerer.client.ListNetworks("")
if err != nil {
return nil, fmt.Errorf("could not get docker networks: %s", err)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nipick: extra space after get

@@ -193,11 +232,12 @@ func NewDriver() (*Driver, error) {
var ovsdb *libovsdb.OvsdbClient
retries := 3
for i := 0; i < retries; i++ {
ovsdb, err = libovsdb.Connect(localhost, ovsdbPort)
//ovsdb, err = libovsdb.Connect(localhost, ovsdbPort)
ovsdb, err = libovsdb.ConnectWithUnixSocket("/var/run/openvswitch/db.sock")
Copy link

@huikang huikang Mar 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this var/run/openvswitch/db.sock the default value for ovsdb socket?

Actually, I'd prefer using libovsdb.Connect rather than ConnectWithUnixSocket.

return nil, fmt.Errorf("could not get docker networks: %s", err)
}
for _, net := range netlist{
if net.Driver == DriverName{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants