github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-22 10:00:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dev/add_if_name

Browse Source
This commit is contained in:
Tomofumi Hayashi
2018-03-23 15:11:41 +09:00
parent 633ddf384d 81e8ff3ba3
commit 8f7c57b22b
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
multus/multus.go
View File

@@ -304,21 +304,15 @@ func parsePodNetworkObject(podnetwork string) ([]map[string]interface{}, error)
return nil, fmt.Errorf("parsePodNetworkObject: pod annotation not having \"network\" as key, refer Multus README.md for the usage guide")
}
// Determine if the string is JSON format, or comma-delimited.
if (isJSON(podnetwork)) {
// Use the JSON as-is
if err := json.Unmarshal([]byte(podnetwork), &podNet); err != nil {
return nil, fmt.Errorf("parsePodNetworkObject: failed to load pod network err: %v | pod network: %v", err, podnetwork)
}
} else {
// Build a map from the comma delimited items.
// Parse the podnetwork string, and assume it is JSON.
if err := json.Unmarshal([]byte(podnetwork), &podNet); err != nil {
// If the JSON parsing fails, assume it is comma delimited.
commaItems := strings.Split(podnetwork, ",")
// Build a map from the comma delimited items.
for i := range commaItems {
netName := strings.TrimSpace(commaItems[i])
atItems := strings.Split(netName, "@")
atItems := strings.Split(commaItems[i], "@")
m := make(map[string]interface{})
m["name"] = atItems[0]
m["name"] = strings.TrimSpace(atItems[0])
if len(atItems) == 2 {
m["interfaceRequest"] = atItems[1]
}