Added - Support for EXACC | LACP for client/backup networks (post MVP)

ankitrmahale · NagendraNigade · commit a96afa57b14e · 2023-05-06T21:39:53.000+05:30
diff --git a/examples/database/exadata_cc/exadata-infrastructure.tf b/examples/database/exadata_cc/exadata-infrastructure.tf
@@ -50,6 +50,12 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   is_cps_offline_report_enabled = false
   is_multi_rack_deployment      = false
 
+  #Optional
+  network_bonding_mode_details {
+    backup_network_bonding_mode = "ACTIVE_BACKUP"
+    client_network_bonding_mode = "ACTIVE_BACKUP"
+  }
+
   #Optional
   contacts {
     email        = "testuser2@testdomain.com"
diff --git a/internal/integrationtest/database_exadata_infrastructure_test.go b/internal/integrationtest/database_exadata_infrastructure_test.go
diff --git a/internal/service/database/database_exadata_infrastructure_data_source.go b/internal/service/database/database_exadata_infrastructure_data_source.go
@@ -204,6 +204,12 @@ func (s *DatabaseExadataInfrastructureDataSourceCrud) SetData() error {
 		s.D.Set("netmask", *s.Res.Netmask)
 	}
 
+	if s.Res.NetworkBondingModeDetails != nil {
+		s.D.Set("network_bonding_mode_details", []interface{}{NetworkBondingModeDetailsToMap(s.Res.NetworkBondingModeDetails)})
+	} else {
+		s.D.Set("network_bonding_mode_details", nil)
+	}
+
 	s.D.Set("ntp_server", s.Res.NtpServer)
 
 	if s.Res.RackSerialNumber != nil {
diff --git a/internal/service/database/database_exadata_infrastructure_resource.go b/internal/service/database/database_exadata_infrastructure_resource.go
@@ -266,6 +266,32 @@ func DatabaseExadataInfrastructureResource() *schema.Resource {
 					},
 				},
 			},
+			"network_bonding_mode_details": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				MaxItems: 1,
+				MinItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+						"backup_network_bonding_mode": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
+						"client_network_bonding_mode": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
+
+						// Computed
+					},
+				},
+			},
 			"multi_rack_configuration_file": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -598,6 +624,17 @@ func (s *DatabaseExadataInfrastructureResourceCrud) Create() error {
 		request.Netmask = &tmp
 	}
 
+	if networkBondingModeDetails, ok := s.D.GetOkExists("network_bonding_mode_details"); ok {
+		if tmpList := networkBondingModeDetails.([]interface{}); len(tmpList) > 0 {
+			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "network_bonding_mode_details", 0)
+			tmp, err := s.mapToNetworkBondingModeDetails(fieldKeyFormat)
+			if err != nil {
+				return err
+			}
+			request.NetworkBondingModeDetails = &tmp
+		}
+	}
+
 	if ntpServer, ok := s.D.GetOkExists("ntp_server"); ok {
 		request.NtpServer = []string{}
 		interfaces := ntpServer.([]interface{})
@@ -801,6 +838,20 @@ func (s *DatabaseExadataInfrastructureResourceCrud) Update() error {
 		request.Netmask = &tmp
 	}
 
+	if networkBondingModeDetails, ok := s.D.GetOkExists("network_bonding_mode_details"); ok && s.D.HasChange("network_bonding_mode_details") {
+
+		if tmpList := networkBondingModeDetails.([]interface{}); len(tmpList) > 0 {
+			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "network_bonding_mode_details", 0)
+			tmp, err := s.mapToNetworkBondingModeDetails(fieldKeyFormat)
+			if err != nil {
+				return err
+			}
+			request.NetworkBondingModeDetails = &tmp
+		} else {
+			request.NetworkBondingModeDetails = nil
+		}
+	}
+
 	if ntpServer, ok := s.D.GetOkExists("ntp_server"); ok && s.D.HasChange("ntp_server") {
 		request.NtpServer = []string{}
 		interfaces := ntpServer.([]interface{})
@@ -999,6 +1050,12 @@ func (s *DatabaseExadataInfrastructureResourceCrud) SetData() error {
 		s.D.Set("netmask", *s.Res.Netmask)
 	}
 
+	if s.Res.NetworkBondingModeDetails != nil {
+		s.D.Set("network_bonding_mode_details", []interface{}{NetworkBondingModeDetailsToMap(s.Res.NetworkBondingModeDetails)})
+	} else {
+		s.D.Set("network_bonding_mode_details", nil)
+	}
+
 	s.D.Set("ntp_server", s.Res.NtpServer)
 
 	if s.Res.Shape != nil {
@@ -1261,6 +1318,30 @@ func ExadataInfrastructureMonthToMap(obj oci_database.Month) map[string]interfac
 	return result
 }
 
+func (s *DatabaseExadataInfrastructureResourceCrud) mapToNetworkBondingModeDetails(fieldKeyFormat string) (oci_database.NetworkBondingModeDetails, error) {
+	result := oci_database.NetworkBondingModeDetails{}
+
+	if backupNetworkBondingMode, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "backup_network_bonding_mode")); ok {
+		result.BackupNetworkBondingMode = oci_database.NetworkBondingModeDetailsBackupNetworkBondingModeEnum(backupNetworkBondingMode.(string))
+	}
+
+	if clientNetworkBondingMode, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "client_network_bonding_mode")); ok {
+		result.ClientNetworkBondingMode = oci_database.NetworkBondingModeDetailsClientNetworkBondingModeEnum(clientNetworkBondingMode.(string))
+	}
+
+	return result, nil
+}
+
+func NetworkBondingModeDetailsToMap(obj *oci_database.NetworkBondingModeDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	result["backup_network_bonding_mode"] = string(obj.BackupNetworkBondingMode)
+
+	result["client_network_bonding_mode"] = string(obj.ClientNetworkBondingMode)
+
+	return result
+}
+
 func (s *DatabaseExadataInfrastructureResourceCrud) updateCompartment(compartment interface{}) error {
 	changeCompartmentRequest := oci_database.ChangeExadataInfrastructureCompartmentRequest{}
 
diff --git a/internal/service/database/database_exadata_infrastructures_data_source.go b/internal/service/database/database_exadata_infrastructures_data_source.go
@@ -248,6 +248,12 @@ func (s *DatabaseExadataInfrastructuresDataSourceCrud) SetData() error {
 			exadataInfrastructure["netmask"] = *r.Netmask
 		}
 
+		if r.NetworkBondingModeDetails != nil {
+			exadataInfrastructure["network_bonding_mode_details"] = []interface{}{NetworkBondingModeDetailsToMap(r.NetworkBondingModeDetails)}
+		} else {
+			exadataInfrastructure["network_bonding_mode_details"] = nil
+		}
+
 		exadataInfrastructure["ntp_server"] = r.NtpServer
 
 		if r.RackSerialNumber != nil {
diff --git a/website/docs/d/database_exadata_infrastructure.html.markdown b/website/docs/d/database_exadata_infrastructure.html.markdown
@@ -94,6 +94,9 @@ The following attributes are exported:
 * `monthly_db_server_version` - The monthly software version of the database servers (dom0) in the Exadata infrastructure.
 * `multi_rack_configuration_file` - The base64 encoded Multi-Rack configuration json file.
 * `netmask` - The netmask for the control plane network.
+* `network_bonding_mode_details` - Details of bonding mode for Client and Backup networks of an Exadata infrastructure.   
+	* `backup_network_bonding_mode` - The network bonding mode for the Exadata infrastructure.
+	* `client_network_bonding_mode` - The network bonding mode for the Exadata infrastructure.
 * `ntp_server` - The list of NTP server IP addresses. Maximum of 3 allowed.
 * `rack_serial_number` - The serial number for the Exadata infrastructure.
 * `shape` - The shape of the Exadata infrastructure. The shape determines the amount of CPU, storage, and memory resources allocated to the instance. 
diff --git a/website/docs/d/database_exadata_infrastructures.html.markdown b/website/docs/d/database_exadata_infrastructures.html.markdown
@@ -104,6 +104,9 @@ The following attributes are exported:
 * `monthly_db_server_version` - The monthly software version of the database servers (dom0) in the Exadata infrastructure.
 * `multi_rack_configuration_file` - The base64 encoded Multi-Rack configuration json file.
 * `netmask` - The netmask for the control plane network.
+* `network_bonding_mode_details` - Details of bonding mode for Client and Backup networks of an Exadata infrastructure.   
+	* `backup_network_bonding_mode` - The network bonding mode for the Exadata infrastructure.
+	* `client_network_bonding_mode` - The network bonding mode for the Exadata infrastructure.
 * `ntp_server` - The list of NTP server IP addresses. Maximum of 3 allowed.
 * `rack_serial_number` - The serial number for the Exadata infrastructure.
 * `shape` - The shape of the Exadata infrastructure. The shape determines the amount of CPU, storage, and memory resources allocated to the instance. 
diff --git a/website/docs/r/database_exadata_infrastructure.html.markdown b/website/docs/r/database_exadata_infrastructure.html.markdown
@@ -71,6 +71,12 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
 		weeks_of_month = var.exadata_infrastructure_maintenance_window_weeks_of_month
 	}
 	multi_rack_configuration_file = var.exadata_infrastructure_multi_rack_configuration_file
+	network_bonding_mode_details {
+
+		#Optional
+		backup_network_bonding_mode = var.exadata_infrastructure_network_bonding_mode_details_backup_network_bonding_mode
+		client_network_bonding_mode = var.exadata_infrastructure_network_bonding_mode_details_client_network_bonding_mode
+	}
 	storage_count = var.exadata_infrastructure_storage_count
 }
 ```
@@ -100,7 +106,7 @@ The following arguments are supported:
 * `infini_band_network_cidr` - (Required) (Updatable) The CIDR block for the Exadata InfiniBand interconnect.
 * `is_cps_offline_report_enabled` - (Optional) (Updatable) Indicates whether cps offline diagnostic report is enabled for this Exadata infrastructure. This will allow a customer to quickly check status themselves and fix problems on their end, saving time and frustration for both Oracle and the customer when they find the CPS in a disconnected state.You can enable offline diagnostic report during Exadata infrastructure provisioning. You can also disable or enable it at any time using the UpdateExadatainfrastructure API. 
 * `is_multi_rack_deployment` - (Optional) (Updatable) Indicates if deployment is Multi-Rack or not.
-* `maintenance_window` - (Optional) (Updatable) The scheduling details for the quarterly maintenance window. Patching and system updates take place during the maintenance window. 
+* `maintenance_window` - (Optional) (Updatable) The scheduling details for the quarterly maintenance window. Patching and system updates take place during the maintenance window.
 	* `custom_action_timeout_in_mins` - (Optional) (Updatable) Determines the amount of time the system will wait before the start of each database server patching operation. Custom action timeout is in minutes and valid value is between 15 to 120 (inclusive). 
 	* `days_of_week` - (Optional) (Updatable) Days during the week when maintenance should be performed.
 		* `name` - (Required) (Updatable) Name of the day of the week.
@@ -118,6 +124,9 @@ The following arguments are supported:
 	* `weeks_of_month` - (Optional) (Updatable) Weeks during the month when maintenance should be performed. Weeks start on the 1st, 8th, 15th, and 22nd days of the month, and have a duration of 7 days. Weeks start and end based on calendar dates, not days of the week. For example, to allow maintenance during the 2nd week of the month (from the 8th day to the 14th day of the month), use the value 2. Maintenance cannot be scheduled for the fifth week of months that contain more than 28 days. Note that this parameter works in conjunction with the  daysOfWeek and hoursOfDay parameters to allow you to specify specific days of the week and hours that maintenance will be performed. 
 * `multi_rack_configuration_file` - (Optional) (Updatable) The base64 encoded Multi-Rack configuration json file.
 * `netmask` - (Required) (Updatable) The netmask for the control plane network.
+* `network_bonding_mode_details` - (Optional) (Updatable) Details of bonding mode for Client and Backup networks of an Exadata infrastructure.
+	* `backup_network_bonding_mode` - (Optional) (Updatable) The network bonding mode for the Exadata infrastructure.
+	* `client_network_bonding_mode` - (Optional) (Updatable) The network bonding mode for the Exadata infrastructure.
 * `ntp_server` - (Required) (Updatable) The list of NTP server IP addresses. Maximum of 3 allowed.
 * `shape` - (Required) The shape of the Exadata infrastructure. The shape determines the amount of CPU, storage, and memory resources allocated to the instance. 
 * `storage_count` - (Optional) The number of storage servers for the Exadata infrastructure.
@@ -187,6 +196,9 @@ The following attributes are exported:
 * `monthly_db_server_version` - The monthly software version of the database servers (dom0) in the Exadata infrastructure.
 * `multi_rack_configuration_file` - The base64 encoded Multi-Rack configuration json file.
 * `netmask` - The netmask for the control plane network.
+* `network_bonding_mode_details` - Details of bonding mode for Client and Backup networks of an Exadata infrastructure.
+	* `backup_network_bonding_mode` - The network bonding mode for the Exadata infrastructure.
+	* `client_network_bonding_mode` - The network bonding mode for the Exadata infrastructure.
 * `ntp_server` - The list of NTP server IP addresses. Maximum of 3 allowed.
 * `rack_serial_number` - The serial number for the Exadata infrastructure.
 * `shape` - The shape of the Exadata infrastructure. The shape determines the amount of CPU, storage, and memory resources allocated to the instance. 
