Skip to content

Commit 8fa00f3

Browse files
committed
Fix device test data and generator updates
1 parent 14d85e1 commit 8fa00f3

File tree

15 files changed

+77
-109
lines changed

15 files changed

+77
-109
lines changed

docs/data-sources/device.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ data "nso_device" "example" {
3535
- `admin_state` (String) Administrative state.
3636
- `authgroup` (String) The authentication credentials used when connecting to this managed device.
3737
- `cli_ned_id` (String) CLI NED ID.
38+
- `generic_ned_id` (String) Generic NED ID.
3839
- `id` (String) The RESTCONF path.
3940
- `netconf_net_id` (String) NETCONF NED ID.
4041
- `port` (Number) Port for the management interface on the device. If this leaf is not configured, NCS will use a default value based on the type of device. For example, a NETCONF device uses port 830, a CLI device over SSH uses port 22, and an SNMP device uses port 161.

docs/resources/device.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ resource "nso_device" "example" {
3737
- Choices: `locked`, `unlocked`, `southbound-locked`, `config-locked`, `call-home`
3838
- `authgroup` (String) The authentication credentials used when connecting to this managed device.
3939
- `cli_ned_id` (String) CLI NED ID.
40+
- `generic_ned_id` (String) Generic NED ID.
4041
- `instance` (String) An instance name from the provider configuration.
4142
- `netconf_net_id` (String) NETCONF NED ID.
4243
- `port` (Number) Port for the management interface on the device. If this leaf is not configured, NCS will use a default value based on the type of device. For example, a NETCONF device uses port 830, a CLI device over SSH uses port 22, and an SNMP device uses port 161.

examples/resources/nso_device/f5-generic-example.tf

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
resource "nso_device" "example" {
2-
name = "test-device01"
3-
address = "10.1.1.1"
4-
port = 22
5-
authgroup = "default"
2+
name = "test-device01"
3+
address = "10.1.1.1"
4+
port = 22
5+
authgroup = "default"
66
admin_state = "locked"
7-
cli_ned_id = "cisco-ios-cli-3.8:cisco-ios-cli-3.8"
7+
cli_ned_id = "cisco-ios-cli-3.8:cisco-ios-cli-3.8"
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
resource "nso_device_group" "example" {
2-
name = "test-group1"
2+
name = "test-group1"
33
device_names = ["ce0"]
44
}

gen/definitions/device.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@ attributes:
6161
tf_name: generic_ned_id
6262
type: String
6363
description: Generic NED ID.
64+
exclude_test: true
6465
example: f5-bigip-nc-1.0:f5-bigip-nc-1.0

internal/provider/data_source_nso_device_group_test.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/provider/data_source_nso_device_test.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/provider/model_nso_device.go

Lines changed: 35 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/provider/model_nso_device_group.go

Lines changed: 19 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)