Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add status and public_ip attribute for compute instance #750

Merged
merged 1 commit into from
Dec 18, 2020
Merged

add status and public_ip attribute for compute instance #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/data-sources/compute_instance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ In addition to all arguments above, the following attributes are exported:
* `key_pair` - The key pair that is used to authenticate the instance.
* `public_ip` - The EIP address that is associted to the instance.
* `system_disk_id` - The system disk voume ID.
* `user_data` - The user data (information after encoding) configured during instance creation.
* `security_groups` - An array of one or more security group names
to associate with the instance.
* `network` - An array of one or more networks to attach to the instance.
Expand Down
2 changes: 2 additions & 0 deletions docs/resources/compute_instance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ The `scheduler_hints` block supports:
In addition to all arguments above, the following attributes are exported:

* `id` - Specifies a resource ID in UUID format.
* `status` - The status of the instance.
* `public_ip` - The EIP address that is associted to the instance.
* `access_ip_v4` - The first detected Fixed IPv4 address _or_ the
Floating IP.
* `network/fixed_ip_v4` - The Fixed IPv4 address of the Instance on that network.
Expand Down
220 changes: 126 additions & 94 deletions huaweicloud/resource_huaweicloud_compute_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ func ResourceComputeInstanceV2() *schema.Resource {
Computed: true,
ForceNew: true,
},

"availability_zone": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"name": {
Type: schema.TypeString,
Required: true,
Expand Down Expand Up @@ -86,18 +90,23 @@ func ResourceComputeInstanceV2() *schema.Resource {
Computed: true,
DefaultFunc: schema.EnvDefaultFunc("HW_FLAVOR_NAME", nil),
},
"admin_pass": {
Type: schema.TypeString,
Sensitive: true,
Optional: true,
},
"key_pair": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"security_groups": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
"availability_zone": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"network": {
Type: schema.TypeList,
Required: true,
Expand Down Expand Up @@ -146,84 +155,6 @@ func ResourceComputeInstanceV2() *schema.Resource {
},
},
},
"user_data": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
// just stash the hash for state & diff comparisons
StateFunc: func(v interface{}) string {
switch v.(type) {
case string:
hash := sha1.Sum([]byte(v.(string)))
return hex.EncodeToString(hash[:])
default:
return ""
}
},
},
"metadata": {
Type: schema.TypeMap,
Optional: true,
ConflictsWith: []string{"system_disk_type", "system_disk_size", "data_disks"},
Deprecated: "use tags instead",
Elem: &schema.Schema{Type: schema.TypeString},
},
"admin_pass": {
Type: schema.TypeString,
Sensitive: true,
Optional: true,
},
"key_pair": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"block_device": {
Type: schema.TypeList,
Optional: true,
ConflictsWith: []string{"system_disk_type", "system_disk_size", "data_disks"},
Deprecated: "use system_disk_type, system_disk_size, data_disks instead",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"source_type": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"uuid": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"volume_size": {
Type: schema.TypeInt,
Optional: true,
ForceNew: true,
},
"destination_type": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"boot_index": {
Type: schema.TypeInt,
Optional: true,
ForceNew: true,
},
"delete_on_termination": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
},
"guest_format": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
},
},
},
"system_disk_type": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -296,6 +227,21 @@ func ResourceComputeInstanceV2() *schema.Resource {
},
Set: resourceComputeSchedulerHintsHash,
},
"user_data": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
// just stash the hash for state & diff comparisons
StateFunc: func(v interface{}) string {
switch v.(type) {
case string:
hash := sha1.Sum([]byte(v.(string)))
return hex.EncodeToString(hash[:])
default:
return ""
}
},
},
"stop_before_destroy": {
Type: schema.TypeBool,
Optional: true,
Expand Down Expand Up @@ -385,6 +331,10 @@ func ResourceComputeInstanceV2() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"public_ip": {
Type: schema.TypeString,
Computed: true,
},
"access_ip_v4": {
Type: schema.TypeString,
Computed: true,
Expand All @@ -393,6 +343,65 @@ func ResourceComputeInstanceV2() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"status": {
Type: schema.TypeString,
Computed: true,
},

// Deprecated
"metadata": {
Type: schema.TypeMap,
Optional: true,
ConflictsWith: []string{"system_disk_type", "system_disk_size", "data_disks"},
Deprecated: "use tags instead",
Elem: &schema.Schema{Type: schema.TypeString},
},
"block_device": {
Type: schema.TypeList,
Optional: true,
ConflictsWith: []string{"system_disk_type", "system_disk_size", "data_disks"},
Deprecated: "use system_disk_type, system_disk_size, data_disks instead",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"source_type": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"uuid": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"volume_size": {
Type: schema.TypeInt,
Optional: true,
ForceNew: true,
},
"destination_type": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"boot_index": {
Type: schema.TypeInt,
Optional: true,
ForceNew: true,
},
"delete_on_termination": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
},
"guest_format": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
},
},
},
},
}
}
Expand Down Expand Up @@ -650,14 +659,30 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err
d.Set("region", GetRegion(d, config))
d.Set("availability_zone", server.AvailabilityZone)
d.Set("name", server.Name)
d.Set("status", server.Status)
d.Set("agency_name", server.Metadata.AgencyName)

flavorInfo := server.Flavor
d.Set("flavor_id", flavorInfo.ID)
d.Set("flavor_name", flavorInfo.Name)

// Set the instance's image information appropriately
if err := setImageInformation(d, computeClient, server.Image.ID); err != nil {
return err
}

if server.KeyName != "" {
d.Set("key_pair", server.KeyName)
}
if eip := computePublicIP(server); eip != "" {
d.Set("public_ip", eip)
}

// Get the instance network and address information
networks, err := flattenInstanceNetworks(d, meta, server)
if err != nil {
return err
}

// Determine the best IPv4 and IPv6 addresses to access the instance with
hostv4, hostv6 := getInstanceAccessAddresses(d, networks)

Expand Down Expand Up @@ -697,10 +722,6 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err
}
d.Set("security_groups", secGrpNames)

flavorInfo := server.Flavor
d.Set("flavor_id", flavorInfo.ID)
d.Set("flavor_name", flavorInfo.Name)

root_volume := ""
// Set volume attached
bds := []map[string]interface{}{}
Expand Down Expand Up @@ -738,11 +759,6 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err
d.Set("system_disk_type", v.VolumeType)
}

// Set the instance's image information appropriately
if err := setImageInformation(d, computeClient, server.Image.ID); err != nil {
return err
}

// Set instance tags
resourceTags, err := tags.Get(ecsClient, "cloudservers", d.Id()).Extract()
if err != nil {
Expand Down Expand Up @@ -1287,6 +1303,22 @@ func setImageInformation(d *schema.ResourceData, computeClient *golangsdk.Servic
return nil
}

// computePublicIP get the first floating address
func computePublicIP(server *cloudservers.CloudServer) string {
var publicIP string

for _, addresses := range server.Addresses {
for _, addr := range addresses {
if addr.Type == "floating" {
publicIP = addr.Addr
break
}
}
}

return publicIP
}

func getFlavorID(client *golangsdk.ServiceClient, d *schema.ResourceData) (string, error) {
if flavorID := d.Get("flavor_id").(string); flavorID != "" {
return flavorID, nil
Expand Down
5 changes: 5 additions & 0 deletions huaweicloud/resource_huaweicloud_compute_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ func TestAccComputeV2Instance_basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists(resourceName, &instance),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "status", "ACTIVE"),
resource.TestCheckResourceAttrSet(resourceName, "system_disk_id"),
resource.TestCheckResourceAttrSet(resourceName, "security_groups.#"),
resource.TestCheckResourceAttrSet(resourceName, "network.#"),
resource.TestCheckResourceAttrSet(resourceName, "volume_attached.#"),
),
},
{
Expand Down