)
type (
- AddressWithPrefix = ip_types.AddressWithPrefix
- MacAddress = ethernet_types.MacAddress
+ Cmd = exec.Cmd
+ MacAddress = ethernet_types.MacAddress
+ AddressWithPrefix = ip_types.AddressWithPrefix
+ IP4AddressWithPrefix = ip_types.IP4AddressWithPrefix
+ InterfaceIndex = interface_types.InterfaceIndex
- NetConfig struct {
- Configure func() error
- Unconfigure func()
+ NetConfig interface {
+ configure() error
+ unconfigure()
+ Name() string
+ Type() string
}
- NetTopology []NetConfig
-
NetConfigBase struct {
name string
category string // what else to call this when `type` is reserved?
}
- NetworkInterfaceVeth struct {
+ NetInterface struct {
NetConfigBase
- index interface_types.InterfaceIndex
- peerNetworkNamespace string
- peerName string
- peerIp4Address string
- ip4Address ip_types.AddressWithPrefix
- hwAddress ethernet_types.MacAddress
- }
-
- NetworkInterfaceTap struct {
- NetConfigBase
- index interface_types.InterfaceIndex
- ip4Address string
+ ip4AddrAllocator *Ip4AddressAllocator
+ ip4Address string
+ index InterfaceIndex
+ hwAddress MacAddress
+ networkNamespace string
+ networkNumber int
+ peer *NetInterface
}
NetworkNamespace struct {
Bridge string = "bridge"
)
-func (b NetConfigBase) Name() string {
- return b.name
-}
+type InterfaceAdder func(n *NetInterface) *Cmd
-func (b NetConfigBase) Type() string {
- return b.category
-}
+var (
+ ipCommandMap = map[string]InterfaceAdder{
+ Veth: func(n *NetInterface) *Cmd {
+ return exec.Command("ip", "link", "add", n.name, "type", "veth", "peer", "name", n.peer.name)
+ },
+ Tap: func(n *NetInterface) *Cmd {
+ return exec.Command("ip", "tuntap", "add", n.name, "mode", "tap")
+ },
+ }
+)
-func (iface NetworkInterfaceVeth) Configure() error {
- err := AddVethPair(iface.name, iface.peerName)
- if err != nil {
- return err
+func newNetworkInterface(cfg NetDevConfig, a *Ip4AddressAllocator) (*NetInterface, error) {
+ var newInterface *NetInterface = &NetInterface{}
+ var err error
+ newInterface.ip4AddrAllocator = a
+ newInterface.name = cfg["name"].(string)
+ newInterface.networkNumber = DEFAULT_NETWORK_NUM
+
+ if interfaceType, ok := cfg["type"]; ok {
+ newInterface.category = interfaceType.(string)
}
- if iface.peerNetworkNamespace != "" {
- err := LinkSetNetns(iface.peerName, iface.peerNetworkNamespace)
+ if presetHwAddress, ok := cfg["preset-hw-address"]; ok {
+ newInterface.hwAddress, err = ethernet_types.ParseMacAddress(presetHwAddress.(string))
if err != nil {
- return err
+ return &NetInterface{}, err
}
}
- if iface.peerIp4Address != "" {
- err = AddAddress(iface.peerName, iface.peerIp4Address, iface.peerNetworkNamespace)
+ if netns, ok := cfg["netns"]; ok {
+ newInterface.networkNamespace = netns.(string)
+ }
+
+ if ip, ok := cfg["ip4"]; ok {
+ if n, ok := ip.(NetDevConfig)["network"]; ok {
+ newInterface.networkNumber = n.(int)
+ }
+ newInterface.ip4Address, err = newInterface.ip4AddrAllocator.NewIp4InterfaceAddress(
+ newInterface.networkNumber,
+ )
if err != nil {
- return fmt.Errorf("failed to add configure address for %s: %v", iface.peerName, err)
+ return &NetInterface{}, err
}
}
- return nil
-}
-func (iface NetworkInterfaceVeth) Unconfigure() {
- DelLink(iface.name)
-}
+ if _, ok := cfg["peer"]; !ok {
+ return newInterface, nil
+ }
+
+ peer := cfg["peer"].(NetDevConfig)
-func (iface NetworkInterfaceVeth) Address() string {
- return strings.Split(iface.ip4Address.String(), "/")[0]
+ if newInterface.peer, err = newNetworkInterface(peer, a); err != nil {
+ return &NetInterface{}, err
+ }
+
+ return newInterface, nil
}
-func (iface NetworkInterfaceTap) Configure() error {
- err := AddTap(iface.name, iface.ip4Address)
+func (n *NetInterface) configureUpState() error {
+ err := setDevUp(n.Name(), "")
if err != nil {
- return err
+ return fmt.Errorf("set link up failed: %v", err)
}
return nil
}
-func (iface NetworkInterfaceTap) Unconfigure() {
- DelLink(iface.name)
+func (n *NetInterface) configureNetworkNamespace() error {
+ if n.networkNamespace != "" {
+ err := linkSetNetns(n.name, n.networkNamespace)
+ if err != nil {
+ return err
+ }
+ }
+ return nil
}
-func (ns NetworkNamespace) Configure() error {
- return addDelNetns(ns.name, true)
-}
+func (n *NetInterface) configureAddress() error {
+ if n.ip4Address != "" {
+ if err := addAddress(
+ n.Name(),
+ n.ip4Address,
+ n.networkNamespace,
+ ); err != nil {
+ return err
+ }
-func (ns NetworkNamespace) Unconfigure() {
- addDelNetns(ns.name, false)
+ }
+ return nil
}
-func (b NetworkBridge) Configure() error {
- return AddBridge(b.name, b.interfaces, b.networkNamespace)
-}
+func (n *NetInterface) configure() error {
+ cmd := ipCommandMap[n.Type()](n)
+ _, err := cmd.CombinedOutput()
+ if err != nil {
+ return fmt.Errorf("creating interface '%v' failed: %v", n.Name(), err)
+ }
-func (b NetworkBridge) Unconfigure() {
- DelBridge(b.name, b.networkNamespace)
-}
+ if err := n.configureUpState(); err != nil {
+ return err
+ }
-func (t *NetTopology) Configure() error {
- for _, c := range *t {
- err := c.Configure()
- if err != nil {
+ if err := n.configureNetworkNamespace(); err != nil {
+ return err
+ }
+
+ if err := n.configureAddress(); err != nil {
+ return err
+ }
+
+ if n.peer != nil && n.peer.name != "" {
+ if err := n.peer.configureUpState(); err != nil {
+ return err
+ }
+
+ if err := n.peer.configureNetworkNamespace(); err != nil {
+ return err
+ }
+
+ if err := n.peer.configureAddress(); err != nil {
return err
}
}
+
return nil
}
-func (t *NetTopology) Unconfigure() {
- for _, c := range *t {
- c.Unconfigure()
- }
+func (n *NetInterface) unconfigure() {
+ delLink(n.name)
}
-func newConfigFn(cfg NetDevConfig) func() error {
- t := cfg["type"]
- if t == "netns" {
- return func() error { return AddNetns(cfg["name"].(string)) }
- } else if t == "veth" {
- return func() error {
- var peerNs string
- peer := cfg["peer"].(NetDevConfig)
- peerName := peer["name"].(string)
- err := AddVethPair(cfg["name"].(string), peerName)
- if err != nil {
- return err
- }
-
- if peer["netns"] != nil {
- peerNs = peer["netns"].(string)
- if peerNs != "" {
- err := LinkSetNetns(peerName, peerNs)
- if err != nil {
- return err
- }
- }
- }
- if peer["ip4"] != nil {
- err = AddAddress(peerName, peer["ip4"].(string), peerNs)
- if err != nil {
- return fmt.Errorf("failed to add configure address for %s: %v", peerName, err)
- }
- }
- return nil
- }
- } else if t == "bridge" {
- return func() error { return configureBridge(cfg) }
- } else if t == "tap" {
- return func() error { return configureTap(cfg) }
- }
- return nil
+func (n *NetInterface) Name() string {
+ return n.name
}
-func newUnconfigFn(cfg NetDevConfig) func() {
- t := cfg["type"]
- name := cfg["name"].(string)
+func (n *NetInterface) Type() string {
+ return n.category
+}
- if t == "tap" {
- return func() { DelLink(name) }
- } else if t == "netns" {
- return func() { DelNetns(name) }
- } else if t == "veth" {
- return func() { DelLink(name) }
- } else if t == "bridge" {
- return func() { DelBridge(name, cfg["netns"].(string)) }
- }
- return nil
+func (n *NetInterface) addressWithPrefix() AddressWithPrefix {
+ address, _ := ip_types.ParseAddressWithPrefix(n.ip4Address)
+ return address
}
-func NewNetConfig(cfg NetDevConfig) NetConfig {
- var nc NetConfig
+func (n *NetInterface) ip4AddressWithPrefix() IP4AddressWithPrefix {
+ ip4Prefix, _ := ip_types.ParseIP4Prefix(n.ip4Address)
+ ip4AddressWithPrefix := ip_types.IP4AddressWithPrefix(ip4Prefix)
+ return ip4AddressWithPrefix
+}
- nc.Configure = newConfigFn(cfg)
- nc.Unconfigure = newUnconfigFn(cfg)
+func (n *NetInterface) ip4AddressString() string {
+ return strings.Split(n.ip4Address, "/")[0]
+}
- return nc
+func (b *NetConfigBase) Name() string {
+ return b.name
}
-func NewNetNamespace(cfg NetDevConfig) (NetworkNamespace, error) {
+func (b *NetConfigBase) Type() string {
+ return b.category
+}
+
+func newNetNamespace(cfg NetDevConfig) (NetworkNamespace, error) {
var networkNamespace NetworkNamespace
networkNamespace.name = cfg["name"].(string)
- networkNamespace.category = "netns"
+ networkNamespace.category = NetNs
return networkNamespace, nil
}
-func NewBridge(cfg NetDevConfig) (NetworkBridge, error) {
+func (ns *NetworkNamespace) configure() error {
+ return addDelNetns(ns.name, true)
+}
+
+func (ns *NetworkNamespace) unconfigure() {
+ addDelNetns(ns.name, false)
+}
+
+func newBridge(cfg NetDevConfig) (NetworkBridge, error) {
var bridge NetworkBridge
bridge.name = cfg["name"].(string)
- bridge.category = "bridge"
+ bridge.category = Bridge
for _, v := range cfg["interfaces"].([]interface{}) {
bridge.interfaces = append(bridge.interfaces, v.(string))
}
- bridge.networkNamespace = cfg["netns"].(string)
- return bridge, nil
-}
-
-func NewVeth(cfg NetDevConfig) (NetworkInterfaceVeth, error) {
- var veth NetworkInterfaceVeth
- var err error
- veth.name = cfg["name"].(string)
- veth.category = "veth"
-
- if cfg["preset-hw-address"] != nil {
- veth.hwAddress, err = ethernet_types.ParseMacAddress(cfg["preset-hw-address"].(string))
- if err != nil {
- return NetworkInterfaceVeth{}, err
- }
- }
-
- peer := cfg["peer"].(NetDevConfig)
-
- veth.peerName = peer["name"].(string)
-
- if peer["netns"] != nil {
- veth.peerNetworkNamespace = peer["netns"].(string)
- }
- if peer["ip4"] != nil {
- veth.peerIp4Address = peer["ip4"].(string)
+ bridge.networkNamespace = ""
+ if netns, ok := cfg["netns"]; ok {
+ bridge.networkNamespace = netns.(string)
}
+ return bridge, nil
+}
- return veth, nil
+func (b *NetworkBridge) configure() error {
+ return addBridge(b.name, b.interfaces, b.networkNamespace)
}
-func NewTap(cfg NetDevConfig) (NetworkInterfaceTap, error) {
- var tap NetworkInterfaceTap
- tap.name = cfg["name"].(string)
- tap.category = "tap"
- tap.ip4Address = cfg["ip4"].(string)
- return tap, nil
+func (b *NetworkBridge) unconfigure() {
+ delBridge(b.name, b.networkNamespace)
}
-func DelBridge(brName, ns string) error {
- err := SetDevDown(brName, ns)
- if err != err {
+func delBridge(brName, ns string) error {
+ err := setDevDown(brName, ns)
+ if err != nil {
return err
}
return nil
}
-func configureBridge(dev NetDevConfig) error {
- var ifs []string
- for _, v := range dev["interfaces"].([]interface{}) {
- ifs = append(ifs, v.(string))
- }
- return AddBridge(dev["name"].(string), ifs, dev["netns"].(string))
-}
-
-func configureTap(dev NetDevConfig) error {
- return AddTap(dev["name"].(string), dev["ip4"].(string))
-}
-
-func SetDevUp(dev, ns string) error {
+func setDevUp(dev, ns string) error {
return setDevUpDown(dev, ns, true)
}
-func SetDevDown(dev, ns string) error {
+func setDevDown(dev, ns string) error {
return setDevUpDown(dev, ns, false)
}
-func AddTap(ifName, ifAddress string) error {
- cmd := exec.Command("ip", "tuntap", "add", ifName, "mode", "tap")
- o, err := cmd.CombinedOutput()
- if err != nil {
- s := fmt.Sprintf("error creating tap %s: %v: %s", ifName, err, string(o))
- return errors.New(s)
- }
-
- cmd = exec.Command("ip", "addr", "add", ifAddress, "dev", ifName)
- err = cmd.Run()
- if err != nil {
- DelLink(ifName)
- s := fmt.Sprintf("error setting addr for tap %s: %v", ifName, err)
- return errors.New(s)
- }
-
- err = SetDevUp(ifName, "")
- if err != nil {
- DelLink(ifName)
- return err
- }
- return nil
-}
-
-func DelLink(ifName string) {
+func delLink(ifName string) {
cmd := exec.Command("ip", "link", "del", ifName)
cmd.Run()
}
cmd := appendNetns(c, ns)
err := cmd.Run()
if err != nil {
- s := fmt.Sprintf("error bringing %s device %s!", dev, op)
- return errors.New(s)
- }
- return nil
-}
-
-func AddVethPair(ifName, peerName string) error {
- cmd := exec.Command("ip", "link", "add", ifName, "type", "veth", "peer", "name", peerName)
- err := cmd.Run()
- if err != nil {
- return fmt.Errorf("creating veth pair failed: %v", err)
- }
- err = SetDevUp(ifName, "")
- if err != nil {
- return fmt.Errorf("set link up failed: %v", err)
+ return fmt.Errorf("error bringing %s device %s! (cmd: '%s')", dev, op, cmd)
}
return nil
}
cmd := exec.Command("ip", "netns", op, name)
_, err := cmd.CombinedOutput()
if err != nil {
- return errors.New("add/del netns failed")
+ return fmt.Errorf("add/del netns failed (cmd: '%s')", cmd)
}
return nil
}
-func AddNetns(nsName string) error {
- return addDelNetns(nsName, true)
-}
-
-func DelNetns(nsName string) error {
- return addDelNetns(nsName, false)
-}
-
-func LinkSetNetns(ifName, ns string) error {
+func linkSetNetns(ifName, ns string) error {
cmd := exec.Command("ip", "link", "set", "dev", ifName, "up", "netns", ns)
err := cmd.Run()
if err != nil {
return nil
}
-func NewCommand(s []string, ns string) *exec.Cmd {
+func newCommand(s []string, ns string) *exec.Cmd {
return appendNetns(s, ns)
}
cmd := appendNetns(c, ns)
err := cmd.Run()
if err != nil {
- s := fmt.Sprintf("%s %s failed!", op, brName)
+ s := fmt.Sprintf("%s %s failed! err: '%s'", op, brName, err)
return errors.New(s)
}
return nil
}
-func AddBridge(brName string, ifs []string, ns string) error {
+func addBridge(brName string, ifs []string, ns string) error {
err := addDelBridge(brName, ns, true)
if err != nil {
return err
cmd := appendNetns(c, ns)
err = cmd.Run()
if err != nil {
- s := fmt.Sprintf("error adding %s to bridge %s: %v", v, brName, err)
- return errors.New(s)
+ return fmt.Errorf("error adding %s to bridge %s: %s", v, brName, err)
}
}
- err = SetDevUp(brName, ns)
+ err = setDevUp(brName, ns)
if err != nil {
return err
}
Code Review / vpp.git / blobdiff