Skip to content

Commit fe66c01

Browse files
authored
Merge pull request #581 from ovh/dev/aamstutz/add-dedicated-server-display-name
feat: Add display_name to datasource ovh_dedicated_server
2 parents 5bfc31e + b835cec commit fe66c01

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

Diff for: ovh/data_dedicated_server.go

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func dataSourceDedicatedServer() *schema.Resource {
2222
Type: schema.TypeString,
2323
Computed: true,
2424
},
25+
"display_name": {
26+
Type: schema.TypeString,
27+
Computed: true,
28+
},
2529
"boot_id": {
2630
Type: schema.TypeInt,
2731
Computed: true,
@@ -206,6 +210,7 @@ func dataSourceDedicatedServerRead(d *schema.ResourceData, meta interface{}) err
206210

207211
d.SetId(ds.Name)
208212
d.Set("urn", ds.URN)
213+
d.Set("display_name", ds.DisplayName)
209214
d.Set("boot_id", ds.BootId)
210215
d.Set("boot_script", ds.BootScript)
211216
d.Set("commercial_range", ds.CommercialRange)

Diff for: ovh/data_dedicated_server_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ func TestAccDedicatedServerDataSource_basic(t *testing.T) {
3131
"data.ovh_dedicated_server.server", "boot_script", ""),
3232
resource.TestCheckResourceAttrSet(
3333
"data.ovh_dedicated_server.server", "urn"),
34+
resource.TestCheckResourceAttrSet(
35+
"data.ovh_dedicated_server.server", "display_name"),
3436
),
3537
},
3638
},

Diff for: website/docs/d/dedicated_server.html.markdown

+16-15
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,27 @@ data "ovh_dedicated_server" "server" {
2323
`id` is set with the service_name of the dedicated server.
2424
In addition, the following attributes are exported:
2525

26-
* `boot_id` - boot id of the server
27-
* `boot_script` - boot script of the server
26+
* `boot_id` - Boot id of the server
27+
* `boot_script` - Boot script of the server
2828
* `urn` - URN of the dedicated server instance
29-
* `commercial_range` - dedicated server commercial range
30-
* `datacenter` - dedicated datacenter localisation (bhs1,bhs2,...)
31-
* `ip` - dedicated server ip (IPv4)
32-
* `ips` - dedicated server ip blocks
33-
* `link_speed` - link speed of the server
29+
* `commercial_range` - Dedicated server commercial range
30+
* `datacenter` - Dedicated datacenter localisation (bhs1,bhs2,...)
31+
* `ip` - Dedicated server ip (IPv4)
32+
* `ips` - Dedicated server ip blocks
33+
* `link_speed` - Link speed of the server
3434
* `monitoring` - Icmp monitoring state
35-
* `name` - dedicated server name
35+
* `name` - Dedicated server name
36+
* `display_name` - Dedicated server display name
3637
* `os` - Operating system
3738
* `professional_use` - Does this server have professional use option
38-
* `rack` - rack id of the server
39-
* `rescue_mail` - rescue mail of the server
40-
* `reverse` - dedicated server reverse
41-
* `root_device` - root device of the server
42-
* `server_id` - your server id
43-
* `state` - error, hacked, hackedBlocked, ok
39+
* `rack` - Rack id of the server
40+
* `rescue_mail` - Rescue mail of the server
41+
* `reverse` - Dedicated server reverse
42+
* `root_device` - Root device of the server
43+
* `server_id` - Server id
44+
* `state` - Error, hacked, hackedBlocked, ok
4445
* `support_level` - Dedicated server support level (critical, fastpath, gs, pro)
45-
* `vnis` - the list of Virtualnetworkinterface assiociated with this server
46+
* `vnis` - The list of Virtualnetworkinterface associated with this server
4647
* `enabled` - VirtualNetworkInterface activation state
4748
* `mode` - VirtualNetworkInterface mode (public,vrack,vrack_aggregation)
4849
* `name` - User defined VirtualNetworkInterface name

0 commit comments

Comments
 (0)