Skip to content

Commit

Permalink
updating network addresses
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulomarquesc
paulomarquesc committed Dec 28, 2024
1 parent 57d7ed6 commit fc23b01
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 30 deletions.
5 changes: 3 additions & 2 deletions internal/services/netapp/netapp_volume_group_oracle_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,9 @@ func (r NetAppVolumeGroupOracleResource) Arguments() map[string]*pluginsdk.Schem

"network_features": {
Type: pluginsdk.TypeString,
Required: true,
Computed: true,
Optional: true,
Computed: true, // O+C - This is Optional/Computed because the service team is changing network features on the backend to upgrade everyone from Basic to Standard and there is a feature that allows customers to change network features from portal but not the API. This could cause drift that forces data loss that we want to avoid
Default: string(volumes.NetworkFeaturesBasic),
ValidateFunc: validation.StringInSlice(volumegroups.PossibleValuesForNetworkFeatures(), false),
},

Expand Down
6 changes: 3 additions & 3 deletions internal/services/netapp/netapp_volume_group_oracle_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -809,7 +809,7 @@ resource "azurerm_subnet" "test-delegated" {
name = "acctest-Delegated-Subnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.1.0/24"]
address_prefixes = ["10.88.1.0/24"]
delegation {
name = "testdelegation"
Expand All @@ -825,7 +825,7 @@ resource "azurerm_subnet" "test-non-delegated" {
name = "acctest-Non-Delegated-Subnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.0.0/24"]
address_prefixes = ["10.88.0.0/24"]
}
resource "azurerm_private_endpoint" "test" {
Expand Down
12 changes: 6 additions & 6 deletions internal/services/netapp/netapp_volume_group_sap_hana_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ resource "azurerm_virtual_network" "test_secondary" {
name = "acctest-VirtualNetwork-Secondary-%[2]d"
location = "%[3]s"
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -1074,7 +1074,7 @@ resource "azurerm_subnet" "test_secondary" {
name = "acctest-DelegatedSubnet-%[2]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test_secondary.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand All @@ -1090,7 +1090,7 @@ resource "azurerm_subnet" "test1_secondary" {
name = "acctest-HostsSubnet-%[2]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test_secondary.name
address_prefixes = ["10.6.1.0/24"]
address_prefixes = ["10.88.1.0/24"]
}
resource "azurerm_subnet_network_security_group_association" "test_secondary" {
Expand Down Expand Up @@ -1270,7 +1270,7 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -1282,7 +1282,7 @@ resource "azurerm_subnet" "test" {
name = "acctest-DelegatedSubnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand All @@ -1298,7 +1298,7 @@ resource "azurerm_subnet" "test1" {
name = "acctest-HostsSubnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.1.0/24"]
address_prefixes = ["10.88.1.0/24"]
}
resource "azurerm_subnet_network_security_group_association" "public" {
Expand Down
4 changes: 2 additions & 2 deletions internal/services/netapp/netapp_volume_quota_rule_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2023-08-17T08:01:00Z",
Expand All @@ -210,7 +210,7 @@ resource "azurerm_subnet" "test" {
name = "acctest-DelegatedSubnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand Down
18 changes: 9 additions & 9 deletions internal/services/netapp/netapp_volume_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ resource "azurerm_virtual_network" "test_secondary" {
name = "acctest-VirtualNetwork-secondary-%[2]d"
location = "%[3]s"
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -1230,7 +1230,7 @@ resource "azurerm_subnet" "test_secondary" {
name = "acctest-Subnet-secondary-%[2]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test_secondary.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand Down Expand Up @@ -1289,7 +1289,7 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -1301,7 +1301,7 @@ resource "azurerm_subnet" "test" {
name = "acctest-Subnet-%d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand Down Expand Up @@ -1372,7 +1372,7 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -1384,7 +1384,7 @@ resource "azurerm_subnet" "test" {
name = "acctest-Subnet-%d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand Down Expand Up @@ -1430,7 +1430,7 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
tags = {
"CreatedOnDate" = "2022-07-08T23:50:21Z",
Expand All @@ -1442,7 +1442,7 @@ resource "azurerm_subnet" "test-delegated" {
name = "acctest-Delegated-Subnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.1.0/24"]
address_prefixes = ["10.88.1.0/24"]
delegation {
name = "testdelegation"
Expand All @@ -1458,7 +1458,7 @@ resource "azurerm_subnet" "test-non-delegated" {
name = "acctest-Non-Delegated-Subnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.0.0/24"]
address_prefixes = ["10.88.0.0/24"]
}
`, data.RandomInteger)
}
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/netapp_volume_group_oracle.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ resource "azurerm_virtual_network" "example" {
name = "${var.prefix}-vnet"
location = azurerm_resource_group.example.location
resource_group_name = azurerm_resource_group.example.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
}
resource "azurerm_subnet" "example" {
name = "${var.prefix}-delegated-subnet"
resource_group_name = azurerm_resource_group.example.name
virtual_network_name = azurerm_virtual_network.example.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "exampledelegation"
Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/netapp_volume_group_sap_hana.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ resource "azurerm_virtual_network" "example" {
name = "${var.prefix}-vnet"
location = azurerm_resource_group.example.location
resource_group_name = azurerm_resource_group.example.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
}
resource "azurerm_subnet" "example" {
name = "${var.prefix}-delegated-subnet"
resource_group_name = azurerm_resource_group.example.name
virtual_network_name = azurerm_virtual_network.example.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand All @@ -65,7 +65,7 @@ resource "azurerm_subnet" "example1" {
name = "${var.prefix}-hosts-subnet"
resource_group_name = azurerm_resource_group.example.name
virtual_network_name = azurerm_virtual_network.example.name
address_prefixes = ["10.6.1.0/24"]
address_prefixes = ["10.88.1.0/24"]
}
resource "azurerm_proximity_placement_group" "example" {
Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/vmware_netapp_volume_attachment.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ resource "azurerm_virtual_network" "test" {
name = "example-VirtualNetwork"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.6.0.0/16"]
address_space = ["10.88.0.0/16"]
}
resource "azurerm_subnet" "netappSubnet" {
name = "example-Subnet"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.2.0/24"]
address_prefixes = ["10.88.2.0/24"]
delegation {
name = "testdelegation"
Expand All @@ -60,7 +60,7 @@ resource "azurerm_subnet" "gatewaySubnet" {
name = "GatewaySubnet"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.6.1.0/24"]
address_prefixes = ["10.88.1.0/24"]
}
resource "azurerm_virtual_network_gateway" "test" {
Expand Down

0 comments on commit fc23b01

Please sign in to comment.