multus/types: handle delegates as Go structs and other cleanups

types/conf.go

@@ -0,0 +1,106 @@
+// Copyright (c) 2017 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+const (
+	defaultCNIDir  = "/var/lib/cni/multus"
+	defaultConfDir = "/etc/cni/multus/net.d"
+)
+
+// Convert a raw delegate config map into a DelegateNetConf structure
+func loadDelegateNetConf(rawConf map[string]interface{}) (*DelegateNetConf, error) {
+	bytes, err := json.Marshal(rawConf)
+	if err != nil {
+		return nil, fmt.Errorf("error marshalling delegate config: %v", err)
+	}
+	delegateConf := &DelegateNetConf{}
+	if err = json.Unmarshal(bytes, delegateConf); err != nil {
+		return nil, fmt.Errorf("error unmarshalling delegate config: %v", err)
+	}
+	delegateConf.RawConfig = rawConf
+	delegateConf.Bytes = bytes
+
+	// Do some minimal validation
+	if delegateConf.Type == "" {
+		return nil, fmt.Errorf("delegate must have the 'type' field")
+	}
+
+	return delegateConf, nil
+}
+
+func LoadNetConf(bytes []byte) (*NetConf, error) {
+	netconf := &NetConf{}
+	if err := json.Unmarshal(bytes, netconf); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	// Delegates must always be set. If no kubeconfig is present, the
+	// delegates are executed in-order.  If a kubeconfig is present,
+	// at least one delegate must be present and the first delegate is
+	// the master plugin. Kubernetes CRD delegates are then appended to
+	// the existing delegate list and all delegates executed in-order.
+
+	if len(netconf.RawDelegates) == 0 {
+		return nil, fmt.Errorf("at least one delegate must be specified")
+	}
+
+	if netconf.CNIDir == "" {
+		netconf.CNIDir = defaultCNIDir
+	}
+	if netconf.ConfDir == "" {
+		netconf.ConfDir = defaultConfDir
+	}
+
+	for idx, rawConf := range netconf.RawDelegates {
+		delegateConf, err := loadDelegateNetConf(rawConf)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load delegate %d config: %v", idx, err)
+		}
+		netconf.Delegates = append(netconf.Delegates, delegateConf)
+	}
+	netconf.RawDelegates = nil
+
+	// First delegate is always the master plugin
+	netconf.Delegates[0].MasterPlugin = true
+
+	return netconf, nil
+}
+
+func (d *DelegateNetConf) updateRawConfig() error {
+	if d.IfnameRequest != "" {
+		d.RawConfig["ifnameRequest"] = d.IfnameRequest
+	} else {
+		delete(d.RawConfig, "ifnameRequest")
+	}
+
+	bytes, err := json.Marshal(d.RawConfig)
+	if err != nil {
+		return err
+	}
+	d.Bytes = bytes
+	return nil
+}
+
+// AddDelegates appends the new delegates to the delegates list
+func (n *NetConf) AddDelegates(newDelegates []*DelegateNetConf) error {
+	n.Delegates = append(n.Delegates, newDelegates...)
+	return nil
+}