Unverified Commit ad1eca07 authored by Oilbeater's avatar Oilbeater Committed by GitHub
Browse files

Merge pull request #20 from alauda/feat/merge-nbctl

feat: merge ovn-nbctl request
parents 5d54d8cb 3c617451
No related merge requests found
Showing with 4 additions and 10 deletions
+4 -10
......@@ -73,20 +73,14 @@ func (c Client) CreatePort(ls, port, ip, mac string) (*nic, error) {
mac = address[0]
}
}
cidr, err := c.ovnNbCommand("get", "logical_switch", ls, "other_config:subnet")
output, err := c.ovnNbCommand("get", "logical_switch", ls, "other_config:subnet", "other_config:gateway")
if err != nil {
klog.Errorf("get switch %s failed %v", ls, err)
return nil, err
}
mask := strings.Split(cidr, "/")[1]
gw, err := c.ovnNbCommand("get", "logical_switch", ls, "other_config:gateway")
if err != nil {
klog.Errorf("get switch %s failed %v", ls, err)
return nil, err
}
return &nic{IpAddress: fmt.Sprintf("%s/%s", ip, mask), MacAddress: mac, CIDR: cidr, Gateway: gw}, nil
subnet, gw := strings.Trim(strings.Split(output, "\n")[0], "\""), strings.Trim(strings.Split(output, "\n")[1], "\"")
mask := strings.Split(subnet, "/")[1]
return &nic{IpAddress: fmt.Sprintf("%s/%s", ip, mask), MacAddress: mac, CIDR: subnet, Gateway: gw}, nil
}
type nic struct {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment