attach interface fixed

Author: 0ndi

gcore/resource_gcore_floatingip.go

@@ -31,7 +31,6 @@ func resourceFloatingIP() *schema.Resource {
 			"project_id": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
-				ForceNew: true,
 				ExactlyOneOf: []string{
 					"project_id",
 					"project_name",
@@ -40,7 +39,6 @@ func resourceFloatingIP() *schema.Resource {
 			"region_id": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
-				ForceNew: true,
 				ExactlyOneOf: []string{
 					"region_id",
 					"region_name",
@@ -49,7 +47,6 @@ func resourceFloatingIP() *schema.Resource {
 			"project_name": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
-				ForceNew: true,
 				ExactlyOneOf: []string{
 					"project_id",
 					"project_name",
@@ -58,7 +55,6 @@ func resourceFloatingIP() *schema.Resource {
 			"region_name": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
-				ForceNew: true,
 				ExactlyOneOf: []string{
 					"region_id",
 					"region_name",

gcore/resource_gcore_instance.go

@@ -170,6 +170,7 @@ func resourceInstance() *schema.Resource {
 							Type:        schema.TypeString,
 							Description: "required if type is 'subnet'",
 							Optional:    true,
+							Computed:    true,
 						},
 						//nested map is not supported, in this case, you do not need to use the list for the map
 						"fip_source": {
@@ -503,20 +504,28 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 		for _, assignment := range iface.IPAssignments {
 			subnetID := assignment.SubnetID
 
-			_, ok := interfaces[subnetID]
+			//bad idea, but what to do
+			var iOpts instances.InterfaceOpts
+			var ok bool
+			for _, k := range []string{subnetID, iface.PortID, iface.NetworkID, types.ExternalInterfaceType.String()} {
+				if iOpts, ok = interfaces[k]; ok {
+					break
+				}
+			}
+
 			if !ok {
 				continue
 			}
 
 			i := make(map[string]interface{})
 
-			i["type"] = interfaces[subnetID].Type.String()
+			i["type"] = iOpts.Type.String()
 			i["network_id"] = iface.NetworkID
 			i["subnet_id"] = subnetID
 			i["port_id"] = iface.PortID
-			if interfaces[subnetID].FloatingIP != nil {
-				i["fip_source"] = interfaces[subnetID].FloatingIP.Source.String()
-				i["existing_fip_id"] = interfaces[subnetID].FloatingIP.ExistingFloatingID
+			if iOpts.FloatingIP != nil {
+				i["fip_source"] = iOpts.FloatingIP.Source.String()
+				i["existing_fip_id"] = iOpts.FloatingIP.ExistingFloatingID
 			}
 			i["ip_address"] = iface.IPAssignments[0].IPAddress.String()
 
@@ -698,7 +707,6 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 				opts.SubnetID = iface["subnet_id"].(string)
 			case types.AnySubnetInterfaceType:
 				opts.NetworkID = iface["network_id"].(string)
-			case types.ExternalInterfaceType:
 			case types.ReservedFixedIpType:
 				opts.PortID = iface["port_id"].(string)
 			}

gcore/utils.go

@@ -228,6 +228,11 @@ func extractInstanceInterfaceIntoMap(interfaces []interface{}) (map[string]insta
 			I.FloatingIP = &fip
 		}
 		Interfaces[I.SubnetID] = I
+		Interfaces[I.NetworkID] = I
+		Interfaces[I.PortID] = I
+		if I.Type == types.ExternalInterfaceType {
+			Interfaces[I.Type.String()] = I
+		}
 	}
 	return Interfaces, nil
 }
@@ -470,8 +475,11 @@ func interfaceUniqueID(i interface{}) int {
 	switch types.InterfaceType(iType) {
 	case types.ReservedFixedIpType:
 		io.WriteString(h, e["port_id"].(string))
+	case types.AnySubnetInterfaceType:
+		io.WriteString(h, e["network_id"].(string))
+	case types.SubnetInterfaceType:
+		io.WriteString(h, e["subnet_id"].(string))
 	}
-	io.WriteString(h, e["subnet_id"].(string))
 	return int(binary.BigEndian.Uint64(h.Sum(nil)))
 }