networking: refactor and split KVM logic

[squeed]

This hopefully makes #3695 easier. It also enables cni v0.3 and ipv6.

@sstabellini

[lucab]

Travis is failing due to license header missing on the two new files.

[sstabellini]

Thank you! If the intention is to keep the Xen network initialization functions in stage1-xen, then ensureBridgeIsUp needs to be exported. (Also I am getting an error in types.go, I had to add "package networking" at the top.) Otherwise, we could introduce XenAddNetwork and XenSetup to networking/vm/kvm.go and it would look pretty much like the following. How do you prefer to proceed? +func XenSetup(n *networking.Networking, debug bool) { + n.CreateNS = false + n.AddNet = XenAddNetwork + n.DelNet = XenDelNetwork +} + +func XenAddNetwork(n *networking.Networking, anet *networking.ActiveNet) error { + if anet.Conf.Type == "flannel" { + return errors.New("cannot transform flannel network into basic network") + } + + anet.Runtime.IfName = "vif" + switch anet.Conf.Type { + case "ptp": + err := ExecNetIPAM(n, anet, "vif") + if err != nil { + return err + } + + case "bridge": + config := BridgeNetConf{ + BrName: "rkt0", + MTU: 1500, + } + if err := json.Unmarshal(anet.ConfBytes, &config); err != nil { + return errwrap.Wrap(fmt.Errorf("error parsing %q result", anet.Conf.Name), err) + } + + _, err := EnsureBridgeIsUp(config.BrName, config.MTU) + if err != nil { + return errwrap.Wrap(errors.New("error in time of bridge setup"), err) + } + + anet.Runtime.IfName = config.BrName + err2 := ExecNetIPAM(n, anet, anet.Runtime.IfName) + if err2 != nil { + return err2 + } + + default: + return fmt.Errorf("network %q have unsupported type: %q", anet.Conf.Name, anet.Conf.Type) + } + + return nil +}

[squeed]

@sstabellini Thanks for the feedback; I've made that method public. PTAL.

It's not that I dislike xen, it's just that it's a good test-case for making the networking modular :-).

[sstabellini]

It works now, without any additional changes on my side. Thank you!

One thing though: I don't see XenDelNetwork being called at all. For example, I don't think it gets called when I do `rkt stop'.

[lucab]

@squeed is away for some days, so I'm moving this to the next milestone. Also assigning @sstabellini for a review once this is fixed, to double-check that everything he needs is in place.

[sstabellini]

I'll do, thanks!

[jellonek]

If the answer for above question is no - this is unnecessary line, and this if could be merged with next one.

[jellonek]

Shouldn't there be anet.Conf.IsDefaultGateway?

[squeed]

Ah, you might be right, good catch.

[squeed]

@sstabellini The network is torn down (and thus XenDelNetwork called) at rkt gc time. Hopefully that clears that up.

[jellonek]

Any progress in this PR?

[jellonek]

@sstabellini ping.

[squeed]

Hi there,
Sorry, I've been really swamped with other work. Sadly, my changes also have a nasty merge conflict. I'm working on resolving the merge conflict, but it will be some time. If you have some spare time, merging in master would be a great help.