From 45e2e041adcd34234f84d0a62d258407a9b1c0ad Mon Sep 17 00:00:00 2001 From: Sean Conroy Date: Mon, 30 Sep 2024 12:33:37 +0100 Subject: [PATCH] Remove redundant test_values --- .../expanded_community_list_policy_object.yaml | 1 - gen/definitions/profile_parcels/other_ucse.yaml | 2 -- .../service_lan_vpn_interface_gre.yaml | 4 ---- .../service_lan_vpn_interface_ipsec.yaml | 11 +---------- .../service_lan_vpn_interface_svi.yaml | 3 --- .../profile_parcels/service_routing_eigrp.yaml | 4 ---- .../profile_parcels/service_wireless_lan.yaml | 3 --- .../profile_parcels/transport_t1_e1_controller.yaml | 1 - ...dwan_expanded_community_list_policy_object_test.go | 1 + .../data_source_sdwan_other_ucse_feature_test.go | 2 ++ ...dwan_service_lan_vpn_interface_gre_feature_test.go | 4 ++++ ...an_service_lan_vpn_interface_ipsec_feature_test.go | 9 +++++++++ ...dwan_service_lan_vpn_interface_svi_feature_test.go | 3 +++ ...source_sdwan_service_routing_eigrp_feature_test.go | 6 +++++- ..._source_sdwan_service_wireless_lan_feature_test.go | 3 +++ ...e_sdwan_transport_t1_e1_controller_feature_test.go | 3 ++- ...dwan_expanded_community_list_policy_object_test.go | 1 + .../resource_sdwan_other_ucse_feature_test.go | 2 ++ ...dwan_service_lan_vpn_interface_gre_feature_test.go | 4 ++++ ...an_service_lan_vpn_interface_ipsec_feature_test.go | 9 +++++++++ ...dwan_service_lan_vpn_interface_svi_feature_test.go | 3 +++ ...source_sdwan_service_routing_eigrp_feature_test.go | 6 +++++- ...esource_sdwan_service_wireless_lan_feature_test.go | 3 +++ ...e_sdwan_transport_t1_e1_controller_feature_test.go | 3 ++- 24 files changed, 59 insertions(+), 32 deletions(-) diff --git a/gen/definitions/generic/expanded_community_list_policy_object.yaml b/gen/definitions/generic/expanded_community_list_policy_object.yaml index f37ab2460..e1214a861 100644 --- a/gen/definitions/generic/expanded_community_list_policy_object.yaml +++ b/gen/definitions/generic/expanded_community_list_policy_object.yaml @@ -24,5 +24,4 @@ attributes: type: String description: Expanded community value, e.g. `100:1000` example: 100:1000 - test_value: '"100:1000"' minimum_test_value: '"100:1000"' diff --git a/gen/definitions/profile_parcels/other_ucse.yaml b/gen/definitions/profile_parcels/other_ucse.yaml index 627a36799..a65eea2b5 100644 --- a/gen/definitions/profile_parcels/other_ucse.yaml +++ b/gen/definitions/profile_parcels/other_ucse.yaml @@ -36,12 +36,10 @@ attributes: tf_name: ipv4_address data_path: [imc, ip] example: 2.2.2.2/24 - test_value: '"2.2.2.2/24"' minimum_test_value: '"2.2.2.2/24"' - model_name: defaultGateway data_path: [imc, ip] example: 2.2.2.2 - test_value: '"2.2.2.2"' minimum_test_value: '"2.2.2.2"' - model_name: vlanId data_path: [imc, vlan] diff --git a/gen/definitions/profile_parcels/service_lan_vpn_interface_gre.yaml b/gen/definitions/profile_parcels/service_lan_vpn_interface_gre.yaml index b445f6f51..996281327 100644 --- a/gen/definitions/profile_parcels/service_lan_vpn_interface_gre.yaml +++ b/gen/definitions/profile_parcels/service_lan_vpn_interface_gre.yaml @@ -22,7 +22,6 @@ attributes: tf_name: interface_name data_path: [basic] example: gre1 - test_value: '"gre1"' minimum_test_value: '"gre1"' - model_name: description tf_name: interface_description @@ -32,13 +31,11 @@ attributes: tf_name: ipv4_address data_path: [basic, address] example: 70.1.1.1 - test_value: '"70.1.1.1"' minimum_test_value: '"70.1.1.1"' - model_name: mask tf_name: ipv4_subnet_mask data_path: [basic, address] example: 255.255.255.0 - test_value: '"255.255.255.0"' minimum_test_value: '"255.255.255.0"' - model_name: shutdown data_path: [basic] @@ -66,7 +63,6 @@ attributes: tf_name: tunnel_destination_ipv4_address data_path: [basic] example: 79.1.1.1 - test_value: '"79.1.1.1"' minimum_test_value: '"79.1.1.1"' - model_name: mtu tf_name: ip_mtu diff --git a/gen/definitions/profile_parcels/service_lan_vpn_interface_ipsec.yaml b/gen/definitions/profile_parcels/service_lan_vpn_interface_ipsec.yaml index c1e809a7a..ba1023d18 100644 --- a/gen/definitions/profile_parcels/service_lan_vpn_interface_ipsec.yaml +++ b/gen/definitions/profile_parcels/service_lan_vpn_interface_ipsec.yaml @@ -21,7 +21,6 @@ attributes: - model_name: ifName tf_name: interface_name example: ipsec987 - test_value: '"ipsec987"' minimum_test_value: '"ipsec987"' - model_name: shutdown example: true @@ -32,36 +31,30 @@ attributes: tf_name: ipv4_address data_path: [address] example: 9.7.5.4 - test_value: '"9.7.5.4"' minimum_test_value: '"9.7.5.4"' - model_name: mask tf_name: ipv4_subnet_mask data_path: [address] example: 255.255.255.0 - test_value: '"255.255.255.0"' minimum_test_value: '"255.255.255.0"' - model_name: address tf_name: tunnel_source_ipv4_address data_path: [tunnelSource] example: 1.3.5.88 - test_value: '"1.3.5.88"' minimum_test_value: '"1.3.5.88"' - model_name: mask tf_name: tunnel_source_ipv4_subnet_mask data_path: [tunnelSource] - example: 255.255.255.0 - test_value: '"255.255.255.0"' + example: 255.255.255.0 minimum_test_value: '"255.255.255.0"' - model_name: tunnelSourceInterface tf_name: tunnel_source_interface example: GigabitEthernet8 - test_value: '"GigabitEthernet8"' minimum_test_value: '"GigabitEthernet8"' - model_name: address tf_name: tunnel_destination_ipv4_address data_path: [tunnelDestination] example: 2.55.67.99 - test_value: '"2.55.67.99"' minimum_test_value: '"2.55.67.99"' - model_name: mask tf_name: tunnel_destination_ipv4_subnet_mask @@ -71,7 +64,6 @@ attributes: - model_name: application tf_name: application_tunnel_type example: none - test_value: '"none"' minimum_test_value: '"none"' - model_name: tcpMssAdjust tf_name: tcp_mss @@ -88,7 +80,6 @@ attributes: - model_name: preSharedSecret tf_name: ike_preshared_key example: 123 - test_value: '"123"' minimum_test_value: '"123"' - model_name: ikeVersion example: 1 diff --git a/gen/definitions/profile_parcels/service_lan_vpn_interface_svi.yaml b/gen/definitions/profile_parcels/service_lan_vpn_interface_svi.yaml index 732a7869d..f7efb7207 100644 --- a/gen/definitions/profile_parcels/service_lan_vpn_interface_svi.yaml +++ b/gen/definitions/profile_parcels/service_lan_vpn_interface_svi.yaml @@ -22,7 +22,6 @@ attributes: example: false - model_name: interfaceName example: Vlan1 - test_value: '"Vlan1"' minimum_test_value: '"Vlan1"' - model_name: description tf_name: interface_description @@ -37,13 +36,11 @@ attributes: tf_name: ipv4_address data_path: [ipv4, addressV4] example: 1.2.3.4 - test_value: '"1.2.3.4"' minimum_test_value: '"1.2.3.4"' - model_name: subnetMask data_path: [ipv4, addressV4] tf_name: ipv4_subnet_mask example: 0.0.0.0 - test_value: '"0.0.0.0"' minimum_test_value: '"0.0.0.0"' - model_name: secondaryAddressV4 tf_name: ipv4_secondary_addresses diff --git a/gen/definitions/profile_parcels/service_routing_eigrp.yaml b/gen/definitions/profile_parcels/service_routing_eigrp.yaml index d410aa575..797050505 100644 --- a/gen/definitions/profile_parcels/service_routing_eigrp.yaml +++ b/gen/definitions/profile_parcels/service_routing_eigrp.yaml @@ -15,7 +15,6 @@ attributes: - model_name: asNum tf_name: autonomous_system_id example: 111 - test_value: '"111"' minimum_test_value: '"111"' - model_name: redistribute tf_name: redistributes @@ -45,17 +44,14 @@ attributes: example: 255.255.255.0 - model_name: helloInterval example: 5 - test_value: '5' minimum_test_value: '5' - model_name: holdTime example: 15 - test_value: '15' minimum_test_value: '15' - model_name: type tf_name: authentication_type data_path: [authentication] example: md5 - test_value: '"md5"' minimum_test_value: '"md5"' - model_name: authKey tf_name: hmac_authentication_key diff --git a/gen/definitions/profile_parcels/service_wireless_lan.yaml b/gen/definitions/profile_parcels/service_wireless_lan.yaml index db02b7d9e..b283445ca 100644 --- a/gen/definitions/profile_parcels/service_wireless_lan.yaml +++ b/gen/definitions/profile_parcels/service_wireless_lan.yaml @@ -77,15 +77,12 @@ attributes: example: silver - model_name: country example: GB - test_value: '"GB"' minimum_test_value: '"GB"' - model_name: username example: user1 - test_value: '"user1"' minimum_test_value: '"user1"' - model_name: password example: Test@316s13 - test_value: '"Test@316s13"' minimum_test_value: '"Test@316s13"' - model_name: meDynamicIpEnabled data_path: [meIpConfig] diff --git a/gen/definitions/profile_parcels/transport_t1_e1_controller.yaml b/gen/definitions/profile_parcels/transport_t1_e1_controller.yaml index eceef4730..86ccf939d 100644 --- a/gen/definitions/profile_parcels/transport_t1_e1_controller.yaml +++ b/gen/definitions/profile_parcels/transport_t1_e1_controller.yaml @@ -17,7 +17,6 @@ attributes: example: t1 - model_name: slot example: 11 - test_value: '11' minimum_test_value: '11' - model_name: controllerTxExList tf_name: entries diff --git a/internal/provider/data_source_sdwan_expanded_community_list_policy_object_test.go b/internal/provider/data_source_sdwan_expanded_community_list_policy_object_test.go index 3e3446ac9..9ce36bff6 100644 --- a/internal/provider/data_source_sdwan_expanded_community_list_policy_object_test.go +++ b/internal/provider/data_source_sdwan_expanded_community_list_policy_object_test.go @@ -30,6 +30,7 @@ import ( func TestAccDataSourceSdwanExpandedCommunityListPolicyObject(t *testing.T) { var checks []resource.TestCheckFunc checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_expanded_community_list_policy_object.test", "name", "Example")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_expanded_community_list_policy_object.test", "entries.0.community", "100:1000")) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, diff --git a/internal/provider/data_source_sdwan_other_ucse_feature_test.go b/internal/provider/data_source_sdwan_other_ucse_feature_test.go index 399d62e03..240914999 100644 --- a/internal/provider/data_source_sdwan_other_ucse_feature_test.go +++ b/internal/provider/data_source_sdwan_other_ucse_feature_test.go @@ -38,6 +38,8 @@ func TestAccDataSourceSdwanOtherUCSEProfileParcel(t *testing.T) { checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "access_port_dedicated", "false")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "access_port_shared_type", "ge1")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "access_port_shared_failover_type", "ge2")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "ipv4_address", "2.2.2.2/24")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "default_gateway", "2.2.2.2")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "vlan_id", "3")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "assign_priority", "3")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_other_ucse_feature.test", "interfaces.0.interface_name", "ucse2/0")) diff --git a/internal/provider/data_source_sdwan_service_lan_vpn_interface_gre_feature_test.go b/internal/provider/data_source_sdwan_service_lan_vpn_interface_gre_feature_test.go index f406ea62f..0015b9b62 100644 --- a/internal/provider/data_source_sdwan_service_lan_vpn_interface_gre_feature_test.go +++ b/internal/provider/data_source_sdwan_service_lan_vpn_interface_gre_feature_test.go @@ -33,9 +33,13 @@ func TestAccDataSourceSdwanServiceLANVPNInterfaceGREProfileParcel(t *testing.T) t.Skip("skipping test, set environment variable SDWAN_2012") } var checks []resource.TestCheckFunc + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "interface_name", "gre1")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "interface_description", "gre1")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "ipv4_address", "70.1.1.1")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "ipv4_subnet_mask", "255.255.255.0")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "shutdown", "true")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "tunnel_source_ipv4_address", "78.1.1.1")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "tunnel_destination_ipv4_address", "79.1.1.1")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "ip_mtu", "1500")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "tcp_mss", "1460")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_gre_feature.test", "clear_dont_fragment", "false")) diff --git a/internal/provider/data_source_sdwan_service_lan_vpn_interface_ipsec_feature_test.go b/internal/provider/data_source_sdwan_service_lan_vpn_interface_ipsec_feature_test.go index bcd231f4f..81b6bb62a 100644 --- a/internal/provider/data_source_sdwan_service_lan_vpn_interface_ipsec_feature_test.go +++ b/internal/provider/data_source_sdwan_service_lan_vpn_interface_ipsec_feature_test.go @@ -33,14 +33,23 @@ func TestAccDataSourceSdwanServiceLANVPNInterfaceIPSecProfileParcel(t *testing.T t.Skip("skipping test, set environment variable SDWAN_2012") } var checks []resource.TestCheckFunc + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "interface_name", "ipsec987")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "shutdown", "true")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "interface_description", "ipsec987")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ipv4_address", "9.7.5.4")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ipv4_subnet_mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_source_ipv4_address", "1.3.5.88")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_source_ipv4_subnet_mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_source_interface", "GigabitEthernet8")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_destination_ipv4_address", "2.55.67.99")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_destination_ipv4_subnet_mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "application_tunnel_type", "none")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "tcp_mss", "1460")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "clear_dont_fragment", "false")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ip_mtu", "1500")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "dpd_interval", "10")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "dpd_retries", "3")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_preshared_key", "123")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_version", "1")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_integrity_protocol", "main")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_rekey_interval", "14400")) diff --git a/internal/provider/data_source_sdwan_service_lan_vpn_interface_svi_feature_test.go b/internal/provider/data_source_sdwan_service_lan_vpn_interface_svi_feature_test.go index 6eae5b0fc..b1012659f 100644 --- a/internal/provider/data_source_sdwan_service_lan_vpn_interface_svi_feature_test.go +++ b/internal/provider/data_source_sdwan_service_lan_vpn_interface_svi_feature_test.go @@ -34,9 +34,12 @@ func TestAccDataSourceSdwanServiceLANVPNInterfaceSVIProfileParcel(t *testing.T) } var checks []resource.TestCheckFunc checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "shutdown", "false")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "interface_name", "Vlan1")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "interface_description", "SVI")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "interface_mtu", "1500")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "ip_mtu", "1500")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_address", "1.2.3.4")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_subnet_mask", "0.0.0.0")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_secondary_addresses.0.address", "2.3.4.5")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_secondary_addresses.0.ipv4_subnet_mask", "0.0.0.0")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_lan_vpn_interface_svi_feature.test", "ipv6_address", "2001:0:0:1::0/32")) diff --git a/internal/provider/data_source_sdwan_service_routing_eigrp_feature_test.go b/internal/provider/data_source_sdwan_service_routing_eigrp_feature_test.go index ce755d018..d90df41da 100644 --- a/internal/provider/data_source_sdwan_service_routing_eigrp_feature_test.go +++ b/internal/provider/data_source_sdwan_service_routing_eigrp_feature_test.go @@ -33,8 +33,12 @@ func TestAccDataSourceSdwanServiceRoutingEIGRPProfileParcel(t *testing.T) { t.Skip("skipping test, set environment variable SDWAN_2012") } var checks []resource.TestCheckFunc + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "autonomous_system_id", "111")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "networks.0.ip_address", "100.2.2.3")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "networks.0.mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "hello_interval", "5")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "hold_time", "15")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "authentication_type", "md5")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "md5_keys.0.key_id", "2")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "interfaces.0.name", "GigabitEthernet3")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_routing_eigrp_feature.test", "interfaces.0.shutdown", "false")) @@ -72,7 +76,7 @@ func testAccDataSourceSdwanServiceRoutingEIGRPProfileParcelConfig() string { config += ` name = "TF_TEST"` + "\n" config += ` description = "Terraform integration test"` + "\n" config += ` feature_profile_id = sdwan_service_feature_profile.test.id` + "\n" - config += ` autonomous_system_id = "111"` + "\n" + config += ` autonomous_system_id = 111` + "\n" config += ` networks = [{` + "\n" config += ` ip_address = "100.2.2.3"` + "\n" config += ` mask = "255.255.255.0"` + "\n" diff --git a/internal/provider/data_source_sdwan_service_wireless_lan_feature_test.go b/internal/provider/data_source_sdwan_service_wireless_lan_feature_test.go index 2f1b89a16..c8a930fd7 100644 --- a/internal/provider/data_source_sdwan_service_wireless_lan_feature_test.go +++ b/internal/provider/data_source_sdwan_service_wireless_lan_feature_test.go @@ -43,6 +43,9 @@ func TestAccDataSourceSdwanServiceWirelessLANProfileParcel(t *testing.T) { checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "ssids.0.security_type", "personal")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "ssids.0.passphrase", "MyPassword123")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "ssids.0.qos_profile", "silver")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "country", "GB")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "username", "user1")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "password", "Test@316s13")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_service_wireless_lan_feature.test", "me_dynamic_ip_enabled", "true")) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/internal/provider/data_source_sdwan_transport_t1_e1_controller_feature_test.go b/internal/provider/data_source_sdwan_transport_t1_e1_controller_feature_test.go index d9668eb38..bc333e1bb 100644 --- a/internal/provider/data_source_sdwan_transport_t1_e1_controller_feature_test.go +++ b/internal/provider/data_source_sdwan_transport_t1_e1_controller_feature_test.go @@ -34,6 +34,7 @@ func TestAccDataSourceSdwanTransportT1E1ControllerProfileParcel(t *testing.T) { } var checks []resource.TestCheckFunc checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_transport_t1_e1_controller_feature.test", "type", "t1")) + checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_transport_t1_e1_controller_feature.test", "slot", "11")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_transport_t1_e1_controller_feature.test", "entries.0.t1_description", "T1")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_transport_t1_e1_controller_feature.test", "entries.0.t1_framing", "esf")) checks = append(checks, resource.TestCheckResourceAttr("data.sdwan_transport_t1_e1_controller_feature.test", "entries.0.t1_linecode", "ami")) @@ -75,7 +76,7 @@ func testAccDataSourceSdwanTransportT1E1ControllerProfileParcelConfig() string { config += ` description = "Terraform integration test"` + "\n" config += ` feature_profile_id = sdwan_transport_feature_profile.test.id` + "\n" config += ` type = "t1"` + "\n" - config += ` slot = 11` + "\n" + config += ` slot = "11"` + "\n" config += ` entries = [{` + "\n" config += ` t1_description = "T1"` + "\n" config += ` t1_framing = "esf"` + "\n" diff --git a/internal/provider/resource_sdwan_expanded_community_list_policy_object_test.go b/internal/provider/resource_sdwan_expanded_community_list_policy_object_test.go index c0e2febcf..e0cdd0cf0 100644 --- a/internal/provider/resource_sdwan_expanded_community_list_policy_object_test.go +++ b/internal/provider/resource_sdwan_expanded_community_list_policy_object_test.go @@ -30,6 +30,7 @@ import ( func TestAccSdwanExpandedCommunityListPolicyObject(t *testing.T) { var checks []resource.TestCheckFunc checks = append(checks, resource.TestCheckResourceAttr("sdwan_expanded_community_list_policy_object.test", "name", "Example")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_expanded_community_list_policy_object.test", "entries.0.community", "100:1000")) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, diff --git a/internal/provider/resource_sdwan_other_ucse_feature_test.go b/internal/provider/resource_sdwan_other_ucse_feature_test.go index 48eb64e15..f4a335531 100644 --- a/internal/provider/resource_sdwan_other_ucse_feature_test.go +++ b/internal/provider/resource_sdwan_other_ucse_feature_test.go @@ -38,6 +38,8 @@ func TestAccSdwanOtherUCSEProfileParcel(t *testing.T) { checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "access_port_dedicated", "false")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "access_port_shared_type", "ge1")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "access_port_shared_failover_type", "ge2")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "ipv4_address", "2.2.2.2/24")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "default_gateway", "2.2.2.2")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "vlan_id", "3")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "assign_priority", "3")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_other_ucse_feature.test", "interfaces.0.interface_name", "ucse2/0")) diff --git a/internal/provider/resource_sdwan_service_lan_vpn_interface_gre_feature_test.go b/internal/provider/resource_sdwan_service_lan_vpn_interface_gre_feature_test.go index 909772b75..a6252d10f 100644 --- a/internal/provider/resource_sdwan_service_lan_vpn_interface_gre_feature_test.go +++ b/internal/provider/resource_sdwan_service_lan_vpn_interface_gre_feature_test.go @@ -33,9 +33,13 @@ func TestAccSdwanServiceLANVPNInterfaceGREProfileParcel(t *testing.T) { t.Skip("skipping test, set environment variable SDWAN_2012") } var checks []resource.TestCheckFunc + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "interface_name", "gre1")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "interface_description", "gre1")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "ipv4_address", "70.1.1.1")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "ipv4_subnet_mask", "255.255.255.0")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "shutdown", "true")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "tunnel_source_ipv4_address", "78.1.1.1")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "tunnel_destination_ipv4_address", "79.1.1.1")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "ip_mtu", "1500")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "tcp_mss", "1460")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_gre_feature.test", "clear_dont_fragment", "false")) diff --git a/internal/provider/resource_sdwan_service_lan_vpn_interface_ipsec_feature_test.go b/internal/provider/resource_sdwan_service_lan_vpn_interface_ipsec_feature_test.go index e7ceaea94..65ec8e049 100644 --- a/internal/provider/resource_sdwan_service_lan_vpn_interface_ipsec_feature_test.go +++ b/internal/provider/resource_sdwan_service_lan_vpn_interface_ipsec_feature_test.go @@ -33,14 +33,23 @@ func TestAccSdwanServiceLANVPNInterfaceIPSecProfileParcel(t *testing.T) { t.Skip("skipping test, set environment variable SDWAN_2012") } var checks []resource.TestCheckFunc + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "interface_name", "ipsec987")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "shutdown", "true")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "interface_description", "ipsec987")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ipv4_address", "9.7.5.4")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ipv4_subnet_mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_source_ipv4_address", "1.3.5.88")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_source_ipv4_subnet_mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_source_interface", "GigabitEthernet8")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_destination_ipv4_address", "2.55.67.99")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "tunnel_destination_ipv4_subnet_mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "application_tunnel_type", "none")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "tcp_mss", "1460")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "clear_dont_fragment", "false")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ip_mtu", "1500")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "dpd_interval", "10")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "dpd_retries", "3")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_preshared_key", "123")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_version", "1")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_integrity_protocol", "main")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_ipsec_feature.test", "ike_rekey_interval", "14400")) diff --git a/internal/provider/resource_sdwan_service_lan_vpn_interface_svi_feature_test.go b/internal/provider/resource_sdwan_service_lan_vpn_interface_svi_feature_test.go index f58c4ec83..757dc9484 100644 --- a/internal/provider/resource_sdwan_service_lan_vpn_interface_svi_feature_test.go +++ b/internal/provider/resource_sdwan_service_lan_vpn_interface_svi_feature_test.go @@ -34,9 +34,12 @@ func TestAccSdwanServiceLANVPNInterfaceSVIProfileParcel(t *testing.T) { } var checks []resource.TestCheckFunc checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "shutdown", "false")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "interface_name", "Vlan1")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "interface_description", "SVI")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "interface_mtu", "1500")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "ip_mtu", "1500")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_address", "1.2.3.4")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_subnet_mask", "0.0.0.0")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_secondary_addresses.0.address", "2.3.4.5")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "ipv4_secondary_addresses.0.ipv4_subnet_mask", "0.0.0.0")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_lan_vpn_interface_svi_feature.test", "ipv6_address", "2001:0:0:1::0/32")) diff --git a/internal/provider/resource_sdwan_service_routing_eigrp_feature_test.go b/internal/provider/resource_sdwan_service_routing_eigrp_feature_test.go index b2b23b722..e27644637 100644 --- a/internal/provider/resource_sdwan_service_routing_eigrp_feature_test.go +++ b/internal/provider/resource_sdwan_service_routing_eigrp_feature_test.go @@ -33,8 +33,12 @@ func TestAccSdwanServiceRoutingEIGRPProfileParcel(t *testing.T) { t.Skip("skipping test, set environment variable SDWAN_2012") } var checks []resource.TestCheckFunc + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "autonomous_system_id", "111")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "networks.0.ip_address", "100.2.2.3")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "networks.0.mask", "255.255.255.0")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "hello_interval", "5")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "hold_time", "15")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "authentication_type", "md5")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "md5_keys.0.key_id", "2")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "interfaces.0.name", "GigabitEthernet3")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_routing_eigrp_feature.test", "interfaces.0.shutdown", "false")) @@ -95,7 +99,7 @@ func testAccSdwanServiceRoutingEIGRPProfileParcelConfig_all() string { config += ` name = "TF_TEST_ALL"` + "\n" config += ` description = "Terraform integration test"` + "\n" config += ` feature_profile_id = sdwan_service_feature_profile.test.id` + "\n" - config += ` autonomous_system_id = "111"` + "\n" + config += ` autonomous_system_id = 111` + "\n" config += ` networks = [{` + "\n" config += ` ip_address = "100.2.2.3"` + "\n" config += ` mask = "255.255.255.0"` + "\n" diff --git a/internal/provider/resource_sdwan_service_wireless_lan_feature_test.go b/internal/provider/resource_sdwan_service_wireless_lan_feature_test.go index 5f9e25de5..7b663c867 100644 --- a/internal/provider/resource_sdwan_service_wireless_lan_feature_test.go +++ b/internal/provider/resource_sdwan_service_wireless_lan_feature_test.go @@ -43,6 +43,9 @@ func TestAccSdwanServiceWirelessLANProfileParcel(t *testing.T) { checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "ssids.0.security_type", "personal")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "ssids.0.passphrase", "MyPassword123")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "ssids.0.qos_profile", "silver")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "country", "GB")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "username", "user1")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "password", "Test@316s13")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_service_wireless_lan_feature.test", "me_dynamic_ip_enabled", "true")) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/internal/provider/resource_sdwan_transport_t1_e1_controller_feature_test.go b/internal/provider/resource_sdwan_transport_t1_e1_controller_feature_test.go index 92315e2f9..7244cddbb 100644 --- a/internal/provider/resource_sdwan_transport_t1_e1_controller_feature_test.go +++ b/internal/provider/resource_sdwan_transport_t1_e1_controller_feature_test.go @@ -34,6 +34,7 @@ func TestAccSdwanTransportT1E1ControllerProfileParcel(t *testing.T) { } var checks []resource.TestCheckFunc checks = append(checks, resource.TestCheckResourceAttr("sdwan_transport_t1_e1_controller_feature.test", "type", "t1")) + checks = append(checks, resource.TestCheckResourceAttr("sdwan_transport_t1_e1_controller_feature.test", "slot", "11")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_transport_t1_e1_controller_feature.test", "entries.0.t1_description", "T1")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_transport_t1_e1_controller_feature.test", "entries.0.t1_framing", "esf")) checks = append(checks, resource.TestCheckResourceAttr("sdwan_transport_t1_e1_controller_feature.test", "entries.0.t1_linecode", "ami")) @@ -97,7 +98,7 @@ func testAccSdwanTransportT1E1ControllerProfileParcelConfig_all() string { config += ` description = "Terraform integration test"` + "\n" config += ` feature_profile_id = sdwan_transport_feature_profile.test.id` + "\n" config += ` type = "t1"` + "\n" - config += ` slot = 11` + "\n" + config += ` slot = "11"` + "\n" config += ` entries = [{` + "\n" config += ` t1_description = "T1"` + "\n" config += ` t1_framing = "esf"` + "\n"