From 3c617451efe78b46acddcf012e00d049bf722171 Mon Sep 17 00:00:00 2001 From: MengxinLiu Date: Sun, 5 May 2019 19:35:14 +0800 Subject: [PATCH] feat: merge ovn-nbctl request --- pkg/ovs/ovn-nbctl.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go index bc538720ade..3b9a320e3f5 100644 --- a/pkg/ovs/ovn-nbctl.go +++ b/pkg/ovs/ovn-nbctl.go @@ -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 {