diff options
author | Bin Yang <bin.yang@windriver.com> | 2019-05-16 01:23:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-05-16 01:23:52 +0000 |
commit | fe05f71354a64e761bcd4d8b2307d7ede8164302 (patch) | |
tree | 88e0226379fa533d7b7b8dba336c12163c5a1329 /src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go | |
parent | 82cbd4cf2d85f4e1025e3477c92f706d61cf875a (diff) | |
parent | 9b2e8b3e41dd89bd1cb9a661a10d5d76125af5b1 (diff) |
Merge "Change format of the network file"
Diffstat (limited to 'src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go')
-rw-r--r-- | src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go b/src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go index 959586bc..32bca8fb 100644 --- a/src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go +++ b/src/k8splugin/plugins/ovn4nfvk8s-network/plugin.go @@ -76,25 +76,21 @@ func init() { // CreateNetwork in OVN controller func CreateNetwork(network *v1.OnapNetwork) (string, error) { - config, err := network.DecodeConfig() - if err != nil { - return "", err - } - name := config["name"].(string) - if name == "" { - return "", pkgerrors.New("Empty Name value") - } + name := network.Spec.Name + if name == "" { + return "", pkgerrors.New("Invalid Network Name") + } - subnet := config["subnet"].(string) - if subnet == "" { - return "", pkgerrors.New("Empty Subnet value") - } + subnet := network.Spec.Subnet + if subnet == "" { + return "", pkgerrors.New("Invalid Subnet Address") + } - gatewayIPMask := config["gateway"].(string) - if gatewayIPMask == "" { - return "", pkgerrors.New("Empty Gateway IP Mask") - } + gatewayIPMask := network.Spec.Gateway + if gatewayIPMask == "" { + return "", pkgerrors.New("Invalid Gateway Address") + } routerMac, stderr, err := ovnCmd.Run(getAuthStr(), "--if-exist", "-v", "get", "logical_router_port", "rtos-"+name, "mac") if err != nil { |