WIP: F #477: add nic attributes

opennebula/resource_opennebula_virtual_machine.go

@@ -104,6 +104,18 @@ func nicComputedVMFields() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		//"computed_network_mode_auto": {
+		//	Type:     schema.TypeBool,
+		//	Computed: true,
+		//},
+		//"computed_sched_requirements": {
+		//	Type:     schema.TypeString,
+		//	Computed: true,
+		//},
+		//"computed_sched_rank": {
+		//	Type:     schema.TypeString,
+		//	Computed: true,
+		//},
 	}
 
 }
@@ -123,6 +135,10 @@ func templateNICVMSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				//"network_mode_auto": {
+				//	Type:     schema.TypeBool,
+				//	Computed: true,
+				//},
 			}),
 		},
 	}
@@ -902,6 +918,21 @@ func flattenVMNICComputed(NICConfig map[string]interface{}, NIC shared.NIC) map[
 		NICMap["security_groups"] = NICMap["computed_security_groups"]
 	}
 
+	networkMode, err := NIC.Get(shared.NetworkMode)
+	if err == nil && networkMode == "auto" {
+		NICMap["network_mode_auto"] = true
+	}
+
+	schedReqs, err := NIC.Get(shared.SchedRequirements)
+	if err == nil {
+		NICMap["sched_requirements"] = schedReqs
+	}
+
+	schedRank, err := NIC.Get(shared.SchedRank)
+	if err == nil {
+		NICMap["sched_rank"] = schedRank
+	}
+
 	return NICMap
 }
 
@@ -940,6 +971,10 @@ func matchNIC(NICConfig map[string]interface{}, NIC shared.NIC) bool {
 
 	model, _ := NIC.Get(shared.Model)
 	virtioQueues, _ := NIC.GetStr("VIRTIO_QUEUES")
+	schedRequirements, _ := NIC.Get(shared.SchedRequirements)
+	schedRank, _ := NIC.Get(shared.SchedRank)
+	networkMode, _ := NIC.Get(shared.NetworkMode)
+
 	securityGroupsArray, _ := NIC.Get(shared.SecurityGroups)
 
 	if NICConfig["security_groups"] != nil && len(NICConfig["security_groups"].([]interface{})) > 0 {
@@ -976,7 +1011,10 @@ func matchNIC(NICConfig map[string]interface{}, NIC shared.NIC) bool {
 		emptyOrEqual(NICConfig["mac"], mac) &&
 		emptyOrEqual(NICConfig["physical_device"], physicalDevice) &&
 		emptyOrEqual(NICConfig["model"], model) &&
-		emptyOrEqual(NICConfig["virtio_queues"], virtioQueues)
+		emptyOrEqual(NICConfig["virtio_queues"], virtioQueues) &&
+		emptyOrEqual(NICConfig["sched_requirements"], schedRequirements) &&
+		emptyOrEqual(NICConfig["sched_rank"], schedRank) &&
+		(NICConfig["network_mode_auto"].(bool) == false || networkMode == "auto")
 }
 
 func matchNICComputed(NICConfig map[string]interface{}, NIC shared.NIC) bool {
@@ -1051,8 +1089,13 @@ NICLoop:
 			match = true
 			nicMap = flattenVMNICComputed(nicConfig, nic)
 
-			networkID, _ := nic.GetI(shared.NetworkID)
-			nicMap["network_id"] = networkID
+			networkIDCfg := nicConfig["network_id"].(int)
+			if networkIDCfg == -1 {
+				nicMap["network_id"] = -1
+			} else {
+				networkID, _ := nic.GetI(shared.NetworkID)
+				nicMap["network_id"] = networkID
+			}
 
 			nicList = append(nicList, nicMap)
 
@@ -1863,7 +1906,11 @@ func updateNIC(ctx context.Context, d *schema.ResourceData, meta interface{}) er
 		"security_groups",
 		"model",
 		"virtio_queues",
-		"physical_device")
+		"physical_device",
+		"network_mode_auto",
+		"sched_requirements",
+		"sched_rank",
+	)
 
 	// in case of NICs updated in the middle of the NIC list
 	// they would be reattached at the end of the list (we don't have in place XML-RPC update method).

opennebula/shared_schemas.go

@@ -207,7 +207,8 @@ func nicFields() map[string]*schema.Schema {
 		},
 		"network_id": {
 			Type:     schema.TypeInt,
-			Required: true,
+			Optional: true,
+			Default:  -1,
 		},
 		"network": {
 			Type:     schema.TypeString,
@@ -224,6 +225,18 @@ func nicFields() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"network_mode_auto": {
+			Type:     schema.TypeBool,
+			Optional: true,
+		},
+		"sched_requirements": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+		"sched_rank": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
 	}
 }
 
@@ -536,7 +549,10 @@ func makeNICVector(nicConfig map[string]interface{}) *shared.NIC {
 	for k, v := range nicConfig {
 
 		if k == "network_id" {
-			nic.Add(shared.NetworkID, strconv.Itoa(v.(int)))
+			networkID := v.(int)
+			if networkID != -1 {
+				nic.Add(shared.NetworkID, strconv.Itoa(networkID))
+			}
 			continue
 		}
 
@@ -558,6 +574,15 @@ func makeNICVector(nicConfig map[string]interface{}) *shared.NIC {
 		case "security_groups":
 			nicSecGroups := ArrayToString(v.([]interface{}), ",")
 			nic.Add(shared.SecurityGroups, nicSecGroups)
+		case "network_mode_auto":
+			if v.(bool) {
+				nic.Add(shared.NetworkMode, "auto")
+			}
+		case "sched_requirements":
+			nic.Add(shared.SchedRequirements, v.(string))
+		case "sched_rank":
+			nic.Add(shared.SchedRank, v.(string))
+
 		}
 	}