Compare commits
3 commits
f8c0ee62ec
...
beed163b02
| Author | SHA1 | Date | |
|---|---|---|---|
|
beed163b02 |
|||
|
049cabc489 |
|||
|
1e7575bc7d |
3 changed files with 10 additions and 6 deletions
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
package netns
|
||||
|
||||
func call(name string, fn func() error) error {
|
||||
func call(_ string, fn func() error) error {
|
||||
return fn()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,15 @@ package netns
|
|||
|
||||
import (
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func create(name string) error {
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
base := "/var/run/netns"
|
||||
path := base + "/" + name
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ func CreateVPC(db *badger.DB, name string) error {
|
|||
}
|
||||
|
||||
// create veth public for this netns
|
||||
if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil {
|
||||
if err := netif.CreateVethToNetns("vp-"+name+"-e", "vp-public-i", "/var/run/netns/"+name, 9000); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -34,24 +34,24 @@ func CreateVPC(db *badger.DB, name string) error {
|
|||
}
|
||||
|
||||
// set veth to ext public bridge
|
||||
if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil {
|
||||
if err := netif.BridgeSetMaster("vp-"+name+"-e", "br-public"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// set veth to int public bridge
|
||||
if err := netns.Call(name, func() error {
|
||||
return netif.BridgeSetMaster("vethpublicint", "br-public")
|
||||
return netif.BridgeSetMaster("vp-public-i", "br-public")
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// set set ext veth up
|
||||
if err := netif.LinkSetUp("veth" + name + "ext"); err != nil {
|
||||
if err := netif.LinkSetUp("vp-" + name + "-e"); err != nil {
|
||||
return nil
|
||||
}
|
||||
// set set int veth up
|
||||
if err := netns.Call(name, func() error {
|
||||
return netif.LinkSetUp("vethpublicint")
|
||||
return netif.LinkSetUp("vp-public-i")
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue