Fix tests

docs/resources/device.md

@@ -19,7 +19,7 @@ resource "nso_device" "example" {
   port        = 22
   authgroup   = "default"
   admin_state = "locked"
-  cli_ned_id  = "cisco-ios-cli-3.0:cisco-ios-cli-3.0"
+  cli_ned_id  = "cisco-ios-cli-3.8:cisco-ios-cli-3.8"
 }
 ```
 
@@ -37,8 +37,6 @@ resource "nso_device" "example" {
   - Choices: `locked`, `unlocked`, `southbound-locked`, `config-locked`, `call-home`
 - `authgroup` (String) The authentication credentials used when connecting to this managed device.
 - `cli_ned_id` (String) CLI NED ID.
-- `delete_mode` (String) Configure behavior when deleting/destroying the resource. Either delete the entire object (YANG container) being managed, or only delete the individual resource attributes configured explicitly and leave everything else as-is. Default value is `all`.
-  - Choices: `all`, `attributes`
 - `instance` (String) An instance name from the provider configuration.
 - `netconf_net_id` (String) NETCONF NED ID.
 - `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_config.md

@@ -47,14 +47,14 @@ resource "nso_device_config" "access_list" {
 ### Required
 
 - `device` (String) An NSO device name.
-- `path` (String) A RESTCONF path.
 
 ### Optional
 
 - `attributes` (Map of String) Map of key-value pairs which represents the YANG leafs and its values.
 - `delete` (Boolean) Delete object during destroy operation. Default value is `true`.
 - `instance` (String) An instance name from the provider configuration.
 - `lists` (Attributes List) YANG lists. (see [below for nested schema](#nestedatt--lists))
+- `path` (String) A RESTCONF path.
 
 ### Read-Only
 

docs/resources/device_group.md

@@ -15,7 +15,7 @@ This resource can manage the Device Group configuration.
 ```terraform
 resource "nso_device_group" "example" {
   name         = "test-group1"
-  device_names = ["c1"]
+  device_names = ["ce0"]
 }
 ```
 
@@ -28,8 +28,6 @@ resource "nso_device_group" "example" {
 
 ### Optional
 
-- `delete_mode` (String) Configure behavior when deleting/destroying the resource. Either delete the entire object (YANG container) being managed, or only delete the individual resource attributes configured explicitly and leave everything else as-is. Default value is `all`.
-  - Choices: `all`, `attributes`
 - `device_groups` (List of String) A list of device groups.
 - `device_names` (List of String) A list of device names.
 - `instance` (String) An instance name from the provider configuration.

examples/resources/nso_device/resource.tf

@@ -4,5 +4,5 @@ resource "nso_device" "example" {
   port        = 22
   authgroup   = "default"
   admin_state = "locked"
-  cli_ned_id  = "cisco-ios-cli-3.0:cisco-ios-cli-3.0"
+  cli_ned_id  = "cisco-ios-cli-3.8:cisco-ios-cli-3.8"
 }

examples/resources/nso_device_group/resource.tf

@@ -1,4 +1,4 @@
 resource "nso_device_group" "example" {
   name         = "test-group1"
-  device_names = ["c1"]
+  device_names = ["ce0"]
 }

gen/definitions/device.yaml

@@ -4,6 +4,7 @@ path: tailf-ncs:devices/device=%v
 res_description: This resource can manage the Device configuration.
 ds_description: This data source can read the Device configuration.
 no_augment_config: true
+no_delete_attributes: true
 doc_category: Device
 attributes:
   - yang_name: name
@@ -54,4 +55,4 @@ attributes:
     tf_name: cli_ned_id
     type: String
     description: CLI NED ID.
-    example: cisco-ios-cli-3.0:cisco-ios-cli-3.0
+    example: cisco-ios-cli-3.8:cisco-ios-cli-3.8

gen/definitions/device_group.yaml

@@ -4,6 +4,7 @@ path: tailf-ncs:devices/device-group=%v
 res_description: This resource can manage the Device Group configuration.
 ds_description: This data source can read the Device Group configuration.
 no_augment_config: true
+no_delete_attributes: true
 doc_category: Device
 attributes:
   - yang_name: name
@@ -16,7 +17,7 @@ attributes:
     tf_name: device_names
     type: StringList
     description: A list of device names.
-    example: c1
+    example: ce0
   - yang_name: device-group
     tf_name: device_groups
     type: StringList

internal/provider/data_source_nso_device_config.go

@@ -86,9 +86,9 @@ func (d *DeviceConfigDataSource) Read(ctx context.Context, req datasource.ReadRe
 		return
 	}
 
-	path := "tailf-ncs:devices/device=" + config.Instance.ValueString() + "/config"
+	path := "tailf-ncs:devices/device=" + config.Device.ValueString() + "/config"
 	if config.Path.ValueString() != "" {
-		path = "tailf-ncs:devices/device=" + config.Instance.ValueString() + "/config/" + config.Path.ValueString()
+		path = "tailf-ncs:devices/device=" + config.Device.ValueString() + "/config/" + config.Path.ValueString()
 	}
 
 	tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", path))

internal/provider/data_source_nso_device_config_test.go

@@ -14,7 +14,7 @@ func TestAccDataSourceNsoDeviceConfig(t *testing.T) {
 			{
 				Config: testAccDataSourceNsoDeviceConfigConfig,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("data.nso_device_config.test", "id", "tailf-ncs:devices/device=c1/config"),
+					resource.TestCheckResourceAttr("data.nso_device_config.test", "id", "tailf-ncs:devices/device=ce0/config"),
 					resource.TestCheckResourceAttr("data.nso_device_config.test", "attributes.tailf-ned-cisco-ios:hostname", "R1"),
 				),
 			},
@@ -24,14 +24,14 @@ func TestAccDataSourceNsoDeviceConfig(t *testing.T) {
 
 const testAccDataSourceNsoDeviceConfigConfig = `
 resource "nso_device_config" "test" {
-	device = "c1"
+	device = "ce0"
 	attributes = {
 		"tailf-ned-cisco-ios:hostname" = "R1"
 	}
 }
 
 data "nso_device_config" "test" {
-	device = "c1"
+	device = "ce0"
 	depends_on = [nso_device_config.test]
 }
 `

internal/provider/resource_nso_device_config.go

@@ -57,7 +57,7 @@ func (r *DeviceConfigResource) Schema(ctx context.Context, req resource.SchemaRe
 			},
 			"path": schema.StringAttribute{
 				MarkdownDescription: "A RESTCONF path.",
-				Required:            true,
+				Optional:            true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.RequiresReplace(),
 				},
@@ -139,7 +139,7 @@ func (r *DeviceConfigResource) Create(ctx context.Context, req resource.CreateRe
 		return
 	}
 
-	plan.Id = plan.Path
+	plan.Id = types.StringValue(plan.getPath())
 
 	if plan.Attributes.IsUnknown() {
 		plan.Attributes = types.MapNull(types.StringType)

internal/provider/resource_nso_device_config_test.go

@@ -15,20 +15,20 @@ func TestAccNsoDeviceConfig(t *testing.T) {
 			{
 				Config: testAccNsoDeviceConfigConfig_empty(),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("nso_device_config.test", "id", "tailf-ncs:devices/device=c1/config"),
+					resource.TestCheckResourceAttr("nso_device_config.test", "id", "tailf-ncs:devices/device=ce0/config"),
 				),
 			},
 			{
 				Config: testAccNsoDeviceConfigConfig_hostname("R1"),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("nso_device_config.test", "id", "tailf-ncs:devices/device=c1/config"),
+					resource.TestCheckResourceAttr("nso_device_config.test", "id", "tailf-ncs:devices/device=ce0/config"),
 					resource.TestCheckResourceAttr("nso_device_config.test", "attributes.tailf-ned-cisco-ios:hostname", "R1"),
 				),
 			},
 			{
 				ResourceName:  "nso_device_config.test",
 				ImportState:   true,
-				ImportStateId: "tailf-ncs:devices/device=c1/config",
+				ImportStateId: "tailf-ncs:devices/device=ce0/config",
 			},
 			{
 				Config: testAccNsoDeviceConfigConfig_hostname("R2"),
@@ -39,8 +39,8 @@ func TestAccNsoDeviceConfig(t *testing.T) {
 			{
 				Config: testAccNsoDeviceConfigConfig_nested(),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("nso_device_config.nested", "lists.0.name", "rule"),
-					resource.TestCheckResourceAttr("nso_device_config.nested", "lists.0.items.0.seq", "10"),
+					resource.TestCheckResourceAttr("nso_device_config.nested", "lists.0.name", "std-access-list-rule"),
+					resource.TestCheckResourceAttr("nso_device_config.nested", "lists.0.items.0.rule", "permit ip any"),
 				),
 			},
 		},
@@ -50,15 +50,15 @@ func TestAccNsoDeviceConfig(t *testing.T) {
 func testAccNsoDeviceConfigConfig_empty() string {
 	return `
 	resource "nso_device_config" "test" {
-		device = "c1"
+		device = "ce0"
 	}
 	`
 }
 
 func testAccNsoDeviceConfigConfig_hostname(hostname string) string {
 	return fmt.Sprintf(`
 	resource "nso_device_config" "test" {
-		device = "c1"
+		device = "ce0"
 		attributes = {
 			"tailf-ned-cisco-ios:hostname" = "%s"
 		}
@@ -69,18 +69,17 @@ func testAccNsoDeviceConfigConfig_hostname(hostname string) string {
 func testAccNsoDeviceConfigConfig_nested() string {
 	return `
 	resource "nso_device_config" "nested" {
-		device = "c1"
-		path = "tailf-ned-cisco-ios:access-list/access-list=1"
+		device = "ce0"
+		path = "tailf-ned-cisco-ios:access-list/access-list-standard-range=1"
 		attributes = {
-			id = 1
+			listnumber = 1
 		}
 		lists = [
 			{
-				name = "rule"
-				key = "seq"
+				name = "std-access-list-rule"
+				key = "rule"
 				items = [
 					{
-						seq = 10
 						rule = "permit ip any"
 					}
 				]