diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_locations_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_locations_test.go index d714fd7ea8..4acd6be804 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_locations_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_locations_test.go @@ -40,7 +40,7 @@ func TestAccIBMPdrGetDrLocationsDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetDrLocationsDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_dr_locations" "pdr_get_dr_locations_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" } `) } diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_summary_response_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_summary_response_test.go index c62812bff5..34082338c6 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_summary_response_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_dr_summary_response_test.go @@ -43,7 +43,7 @@ func TestAccIBMPdrGetDrSummaryResponseDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetDrSummaryResponseDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_dr_summary_response" "pdr_get_dr_summary_response_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" } `) } diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_event_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_event_test.go index 2d93aeb298..847c38bbcc 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_event_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_event_test.go @@ -46,7 +46,7 @@ func TestAccIBMPdrGetEventDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetEventDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_event" "pdr_get_event_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" event_id = "492fef47-3ebf-4090-b089-e9b4199878b6-1764568221673678123" } `) diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_events_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_events_test.go index 9cc8420409..72a404fc07 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_events_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_events_test.go @@ -41,7 +41,7 @@ func TestAccIBMPdrGetEventsDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetEventsDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_events" "pdr_get_events_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" time = "2025-11-30T23:59:59Z" from_time = "2025-06-19T00:00:00Z" to_time = "2025-12-01T23:59:59Z" diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_grs_location_pairs_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_grs_location_pairs_test.go index dfac71f0d0..75ada78649 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_grs_location_pairs_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_grs_location_pairs_test.go @@ -35,7 +35,7 @@ func TestAccIBMPdrGetGrsLocationPairsDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetGrsLocationPairsDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_grs_location_pairs" "pdr_get_grs_location_pairs_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" } `) diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_machine_types_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_machine_types_test.go index b028673eb5..c838183f1d 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_machine_types_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_machine_types_test.go @@ -36,7 +36,7 @@ func TestAccIBMPdrGetMachineTypesDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetMachineTypesDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_machine_types" "pdr_get_machine_types_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" primary_workspace_name = "Test-workspace-wdc06" standby_workspace_name = "Test-workspace-wdc07" } diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_managed_vm_list_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_managed_vm_list_test.go index 0c2c423cce..f4938d7faf 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_managed_vm_list_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_managed_vm_list_test.go @@ -39,7 +39,7 @@ func TestAccIBMPdrGetManagedVMListDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetManagedVMListDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_managed_vm_list" "pdr_get_managed_vm_list_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" } `) } diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_get_powervs_workspace_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_get_powervs_workspace_test.go index 349db6c157..7ae089bbed 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_get_powervs_workspace_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_get_powervs_workspace_test.go @@ -42,7 +42,7 @@ func TestAccIBMPdrGetPowervsWorkspaceDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrGetPowervsWorkspaceDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_get_powervs_workspace" "pdr_get_powervs_workspace_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" location_id = "lon04" } `) diff --git a/ibm/service/drautomationservice/data_source_ibm_pdr_last_operation_test.go b/ibm/service/drautomationservice/data_source_ibm_pdr_last_operation_test.go index 0eb1ce37e4..54201a7674 100644 --- a/ibm/service/drautomationservice/data_source_ibm_pdr_last_operation_test.go +++ b/ibm/service/drautomationservice/data_source_ibm_pdr_last_operation_test.go @@ -54,7 +54,7 @@ func TestAccIBMPdrLastOperationDataSourceBasic(t *testing.T) { func testAccCheckIBMPdrLastOperationDataSourceConfigBasic() string { return fmt.Sprintf(` data "ibm_pdr_last_operation" "pdr_last_operation_instance" { - instance_id = "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instance_id = "123456d3-1122-3344-b67d-4389b44b7bf9" } `) } diff --git a/ibm/service/drautomationservice/dra-go-sdk/.secrets.baseline b/ibm/service/drautomationservice/dra-go-sdk/.secrets.baseline index a1e8138cb1..b2526fad35 100644 --- a/ibm/service/drautomationservice/dra-go-sdk/.secrets.baseline +++ b/ibm/service/drautomationservice/dra-go-sdk/.secrets.baseline @@ -3,7 +3,7 @@ "files": "go.sum|^.secrets.baseline$|.cra/.cveignore", "lines": null }, - "generated_at": "2025-10-25T06:42:38Z", + "generated_at": "2025-11-20T05:13:38Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -70,7 +70,7 @@ "hashed_secret": "78f0aa93871c89936d704d3b952120c56a54fa10", "is_secret": false, "is_verified": false, - "line_number": 22, + "line_number": 25, "type": "Hex High Entropy String", "verified_result": null }, @@ -78,7 +78,7 @@ "hashed_secret": "63fd038655cf061dee83085f8d902d1045300b36", "is_secret": false, "is_verified": false, - "line_number": 34, + "line_number": 37, "type": "Secret Keyword", "verified_result": null }, @@ -86,7 +86,7 @@ "hashed_secret": "3fa4fc540742cddaf407be3d5c1473cff0033e1e", "is_secret": false, "is_verified": false, - "line_number": 53, + "line_number": 56, "type": "Secret Keyword", "verified_result": null } @@ -136,7 +136,7 @@ "hashed_secret": "d3757d3106316a04a77f2958c69da829bc883d09", "is_secret": false, "is_verified": false, - "line_number": 1016, + "line_number": 1014, "type": "Secret Keyword", "verified_result": null }, @@ -144,7 +144,7 @@ "hashed_secret": "ba5bf2618937ee2bb431d7f6452bcb6657a3482d", "is_secret": false, "is_verified": false, - "line_number": 1022, + "line_number": 1020, "type": "Secret Keyword", "verified_result": null }, @@ -152,7 +152,7 @@ "hashed_secret": "4770fa23bfb6c07339814f001b1c0d6fb1dee2d0", "is_secret": false, "is_verified": false, - "line_number": 1043, + "line_number": 1041, "type": "Secret Keyword", "verified_result": null }, @@ -160,7 +160,7 @@ "hashed_secret": "8e766b88a3c9ca1cb944ba338737b5f69f1206b5", "is_secret": false, "is_verified": false, - "line_number": 1061, + "line_number": 1062, "type": "Secret Keyword", "verified_result": null }, @@ -168,7 +168,7 @@ "hashed_secret": "6452e7c5a42f97b00af1a210afc7d4de315e57ec", "is_secret": false, "is_verified": false, - "line_number": 3395, + "line_number": 3392, "type": "Secret Keyword", "verified_result": null } @@ -178,7 +178,7 @@ "hashed_secret": "811424347556b661512671f7a53aafa6aaf03ca2", "is_secret": false, "is_verified": false, - "line_number": 19, + "line_number": 22, "type": "Secret Keyword", "verified_result": null }, @@ -186,7 +186,7 @@ "hashed_secret": "ecb47e6f477780b52e724c150175f80956ef19bd", "is_secret": false, "is_verified": false, - "line_number": 389, + "line_number": 238, "type": "Base64 High Entropy String", "verified_result": null } @@ -204,17 +204,17 @@ "hashed_secret": "ecb47e6f477780b52e724c150175f80956ef19bd", "is_secret": false, "is_verified": false, - "line_number": 344, + "line_number": 343, "type": "Base64 High Entropy String", "verified_result": null } ], "drautomationservicev1/dr_automation_service_v1_integration_test.go": [ { - "hashed_secret": "2c153ebbe6cb5b68bcb51f1e2d1186e4cb54e028", + "hashed_secret": "43040ec446c955fc1235fb8283c87097f2498d50", "is_secret": false, "is_verified": false, - "line_number": 288, + "line_number": 287, "type": "Base64 High Entropy String", "verified_result": null } @@ -232,15 +232,15 @@ "hashed_secret": "55512dd2d5fb5ed9c570d011da4e63e087ab7862", "is_secret": false, "is_verified": false, - "line_number": 3751, + "line_number": 3743, "type": "Secret Keyword", "verified_result": null }, { - "hashed_secret": "2c153ebbe6cb5b68bcb51f1e2d1186e4cb54e028", + "hashed_secret": "43040ec446c955fc1235fb8283c87097f2498d50", "is_secret": false, "is_verified": false, - "line_number": 3807, + "line_number": 3797, "type": "Base64 High Entropy String", "verified_result": null }, @@ -248,7 +248,7 @@ "hashed_secret": "421586bc25f1b16dee534505adc9813acf3578bb", "is_secret": false, "is_verified": false, - "line_number": 4009, + "line_number": 3999, "type": "Secret Keyword", "verified_result": null }, @@ -256,7 +256,7 @@ "hashed_secret": "86f528ff713b453058af8e761eac1ab0be09646f", "is_secret": false, "is_verified": false, - "line_number": 4027, + "line_number": 4017, "type": "Base64 High Entropy String", "verified_result": null } diff --git a/ibm/service/drautomationservice/dra-go-sdk/common/headers.go b/ibm/service/drautomationservice/dra-go-sdk/common/headers.go index 6585b2cbfd..ee38051197 100644 --- a/ibm/service/drautomationservice/dra-go-sdk/common/headers.go +++ b/ibm/service/drautomationservice/dra-go-sdk/common/headers.go @@ -24,10 +24,11 @@ import ( ) const ( - sdkName = "demo-go-sdk" + sdkName = "demo-go-sdk" headerNameUserAgent = "User-Agent" ) +// // GetSdkHeaders - returns the set of SDK-specific headers to be included in an outgoing request. // // This function is invoked by generated service methods (i.e. methods which implement the REST API operations @@ -55,14 +56,13 @@ const ( // as the analytics data collector uses this to gather usage data. // // Parameters: -// -// serviceName - the name of the service as defined in the API definition (e.g. "MyService1") -// serviceVersion - the version of the service as defined in the API definition (e.g. "V1") -// operationId - the operationId as defined in the API definition (e.g. getContext) +// serviceName - the name of the service as defined in the API definition (e.g. "MyService1") +// serviceVersion - the version of the service as defined in the API definition (e.g. "V1") +// operationId - the operationId as defined in the API definition (e.g. getContext) // // Returns: +// a Map which contains the set of headers to be included in the REST API request // -// a Map which contains the set of headers to be included in the REST API request func GetSdkHeaders(serviceName string, serviceVersion string, operationId string) map[string]string { sdkHeaders := make(map[string]string) diff --git a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1.go b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1.go index 153d4b4c0c..90462cbe55 100644 --- a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1.go +++ b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1.go @@ -15,7 +15,7 @@ */ /* - * IBM OpenAPI SDK Code Generator Version: 3.105.0-3c13b041-20250605-193116 + * IBM OpenAPI SDK Code Generator Version: 3.108.0-56772134-20251111-102802 */ // Package drautomationservicev1 : Operations and models for the DrAutomationServiceV1 service @@ -43,7 +43,7 @@ type DrAutomationServiceV1 struct { } // DefaultServiceURL is the default URL to make service requests to. -const DefaultServiceURL = "https://powerdra-test.1lcv1smi8d9z.us-south.codeengine.appdomain.cloud" +const DefaultServiceURL = "https://power-dra.test.cloud.ibm.com" // DefaultServiceName is the default key used to find external configuration information. const DefaultServiceName = "dr_automation_service" @@ -205,21 +205,18 @@ func (drAutomationService *DrAutomationServiceV1) GetApikeyWithContext(ctx conte return } - for headerName, headerValue := range getApikeyOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetApikey") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetApikey") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getApikeyOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getApikeyOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getApikeyOptions.AcceptLanguage)) } - if getApikeyOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getApikeyOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -280,12 +277,12 @@ func (drAutomationService *DrAutomationServiceV1) CreateApikeyWithContext(ctx co return } - for headerName, headerValue := range createApikeyOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "CreateApikey") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "CreateApikey") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range createApikeyOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") @@ -293,9 +290,6 @@ func (drAutomationService *DrAutomationServiceV1) CreateApikeyWithContext(ctx co if createApikeyOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*createApikeyOptions.AcceptLanguage)) } - if createApikeyOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*createApikeyOptions.IfNoneMatch)) - } body := make(map[string]interface{}) if createApikeyOptions.APIKey != nil { @@ -366,12 +360,12 @@ func (drAutomationService *DrAutomationServiceV1) UpdateApikeyWithContext(ctx co return } - for headerName, headerValue := range updateApikeyOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "UpdateApikey") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "UpdateApikey") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range updateApikeyOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") @@ -379,9 +373,6 @@ func (drAutomationService *DrAutomationServiceV1) UpdateApikeyWithContext(ctx co if updateApikeyOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*updateApikeyOptions.AcceptLanguage)) } - if updateApikeyOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*updateApikeyOptions.IfNoneMatch)) - } body := make(map[string]interface{}) if updateApikeyOptions.APIKey != nil { @@ -452,21 +443,18 @@ func (drAutomationService *DrAutomationServiceV1) GetDrGrsLocationPairWithContex return } - for headerName, headerValue := range getDrGrsLocationPairOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrGrsLocationPair") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrGrsLocationPair") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getDrGrsLocationPairOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getDrGrsLocationPairOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getDrGrsLocationPairOptions.AcceptLanguage)) } - if getDrGrsLocationPairOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getDrGrsLocationPairOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -527,21 +515,18 @@ func (drAutomationService *DrAutomationServiceV1) GetDrLocationsWithContext(ctx return } - for headerName, headerValue := range getDrLocationsOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrLocations") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrLocations") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getDrLocationsOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getDrLocationsOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getDrLocationsOptions.AcceptLanguage)) } - if getDrLocationsOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getDrLocationsOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -602,21 +587,18 @@ func (drAutomationService *DrAutomationServiceV1) GetDrManagedVMWithContext(ctx return } - for headerName, headerValue := range getDrManagedVMOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrManagedVM") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrManagedVM") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getDrManagedVMOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getDrManagedVMOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getDrManagedVMOptions.AcceptLanguage)) } - if getDrManagedVMOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getDrManagedVMOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -678,21 +660,18 @@ func (drAutomationService *DrAutomationServiceV1) GetDrSummaryWithContext(ctx co return } - for headerName, headerValue := range getDrSummaryOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrSummary") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetDrSummary") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getDrSummaryOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getDrSummaryOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getDrSummaryOptions.AcceptLanguage)) } - if getDrSummaryOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getDrSummaryOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -754,21 +733,18 @@ func (drAutomationService *DrAutomationServiceV1) GetMachineTypeWithContext(ctx return } - for headerName, headerValue := range getMachineTypeOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetMachineType") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetMachineType") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getMachineTypeOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getMachineTypeOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getMachineTypeOptions.AcceptLanguage)) } - if getMachineTypeOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getMachineTypeOptions.IfNoneMatch)) - } builder.AddQuery("primary_workspace_name", fmt.Sprint(*getMachineTypeOptions.PrimaryWorkspaceName)) if getMachineTypeOptions.StandbyWorkspaceName != nil { @@ -834,18 +810,15 @@ func (drAutomationService *DrAutomationServiceV1) GetPowervsWorkspacesWithContex return } - for headerName, headerValue := range getPowervsWorkspacesOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetPowervsWorkspaces") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetPowervsWorkspaces") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getPowervsWorkspacesOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") - if getPowervsWorkspacesOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getPowervsWorkspacesOptions.IfNoneMatch)) - } builder.AddQuery("location_id", fmt.Sprint(*getPowervsWorkspacesOptions.LocationID)) @@ -908,21 +881,18 @@ func (drAutomationService *DrAutomationServiceV1) GetManageDrWithContext(ctx con return } - for headerName, headerValue := range getManageDrOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetManageDr") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetManageDr") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getManageDrOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getManageDrOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getManageDrOptions.AcceptLanguage)) } - if getManageDrOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getManageDrOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -950,8 +920,9 @@ func (drAutomationService *DrAutomationServiceV1) GetManageDrWithContext(ctx con } // CreateManageDr : Create DR Deployment -// Creates Orchestrator VM in the given workspace and configuration. Orchestrator VM can be used to manage multiple -// virtual servers and help ensure continuous availability. For more details, refer Deploying the Orchestrator - +// Creates DR Deployment by creating Orchestrator instance in the given PowerVS workspace and configuration. +// Orchestrator instance can be used to manage multiple virtual servers and ensure continuous availability. For more +// details, refer Deploying the Orchestrator - // https://cloud.ibm.com/docs/dr-automation-powervs?topic=dr-automation-powervs-idep-the-orch. func (drAutomationService *DrAutomationServiceV1) CreateManageDr(createManageDrOptions *CreateManageDrOptions) (result *ServiceInstanceManageDr, response *core.DetailedResponse, err error) { result, response, err = drAutomationService.CreateManageDrWithContext(context.Background(), createManageDrOptions) @@ -985,12 +956,12 @@ func (drAutomationService *DrAutomationServiceV1) CreateManageDrWithContext(ctx return } - for headerName, headerValue := range createManageDrOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "CreateManageDr") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "CreateManageDr") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range createManageDrOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") @@ -998,9 +969,6 @@ func (drAutomationService *DrAutomationServiceV1) CreateManageDrWithContext(ctx if createManageDrOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*createManageDrOptions.AcceptLanguage)) } - if createManageDrOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*createManageDrOptions.IfNoneMatch)) - } if createManageDrOptions.StandByRedeploy != nil { builder.AddQuery("stand_by_redeploy", fmt.Sprint(*createManageDrOptions.StandByRedeploy)) @@ -1010,27 +978,12 @@ func (drAutomationService *DrAutomationServiceV1) CreateManageDrWithContext(ctx } body := make(map[string]interface{}) - if createManageDrOptions.APIKey != nil { - body["api_key"] = createManageDrOptions.APIKey - } - if createManageDrOptions.ClientID != nil { - body["client_id"] = createManageDrOptions.ClientID - } - if createManageDrOptions.ClientSecret != nil { - body["client_secret"] = createManageDrOptions.ClientSecret - } - if createManageDrOptions.GUID != nil { - body["guid"] = createManageDrOptions.GUID - } if createManageDrOptions.LocationID != nil { body["location_id"] = createManageDrOptions.LocationID } if createManageDrOptions.MachineType != nil { body["machine_type"] = createManageDrOptions.MachineType } - if createManageDrOptions.OrchestratorHa != nil { - body["orchestrator_ha"] = createManageDrOptions.OrchestratorHa - } if createManageDrOptions.OrchestratorLocationType != nil { body["orchestrator_location_type"] = createManageDrOptions.OrchestratorLocationType } @@ -1043,8 +996,20 @@ func (drAutomationService *DrAutomationServiceV1) CreateManageDrWithContext(ctx if createManageDrOptions.OrchestratorWorkspaceID != nil { body["orchestrator_workspace_id"] = createManageDrOptions.OrchestratorWorkspaceID } - if createManageDrOptions.OrchestratorWorkspaceLocation != nil { - body["orchestrator_workspace_location"] = createManageDrOptions.OrchestratorWorkspaceLocation + if createManageDrOptions.APIKey != nil { + body["api_key"] = createManageDrOptions.APIKey + } + if createManageDrOptions.ClientID != nil { + body["client_id"] = createManageDrOptions.ClientID + } + if createManageDrOptions.ClientSecret != nil { + body["client_secret"] = createManageDrOptions.ClientSecret + } + if createManageDrOptions.GUID != nil { + body["guid"] = createManageDrOptions.GUID + } + if createManageDrOptions.OrchestratorHa != nil { + body["orchestrator_ha"] = createManageDrOptions.OrchestratorHa } if createManageDrOptions.ProxyIP != nil { body["proxy_ip"] = createManageDrOptions.ProxyIP @@ -1055,9 +1020,6 @@ func (drAutomationService *DrAutomationServiceV1) CreateManageDrWithContext(ctx if createManageDrOptions.ResourceInstance != nil { body["resource_instance"] = createManageDrOptions.ResourceInstance } - if createManageDrOptions.SecondaryWorkspaceID != nil { - body["secondary_workspace_id"] = createManageDrOptions.SecondaryWorkspaceID - } if createManageDrOptions.Secret != nil { body["secret"] = createManageDrOptions.Secret } @@ -1076,9 +1038,6 @@ func (drAutomationService *DrAutomationServiceV1) CreateManageDrWithContext(ctx if createManageDrOptions.StandbyOrchestratorWorkspaceID != nil { body["standby_orchestrator_workspace_id"] = createManageDrOptions.StandbyOrchestratorWorkspaceID } - if createManageDrOptions.StandbyOrchestratorWorkspaceLocation != nil { - body["standby_orchestrator_workspace_location"] = createManageDrOptions.StandbyOrchestratorWorkspaceLocation - } if createManageDrOptions.StandbyTier != nil { body["standby_tier"] = createManageDrOptions.StandbyTier } @@ -1154,21 +1113,18 @@ func (drAutomationService *DrAutomationServiceV1) GetLastOperationWithContext(ct return } - for headerName, headerValue := range getLastOperationOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetLastOperation") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetLastOperation") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getLastOperationOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getLastOperationOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getLastOperationOptions.AcceptLanguage)) } - if getLastOperationOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getLastOperationOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -1229,21 +1185,18 @@ func (drAutomationService *DrAutomationServiceV1) ListEventsWithContext(ctx cont return } - for headerName, headerValue := range listEventsOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "ListEvents") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "ListEvents") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range listEventsOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if listEventsOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*listEventsOptions.AcceptLanguage)) } - if listEventsOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*listEventsOptions.IfNoneMatch)) - } if listEventsOptions.Time != nil { builder.AddQuery("time", fmt.Sprint(*listEventsOptions.Time)) @@ -1303,7 +1256,7 @@ func (drAutomationService *DrAutomationServiceV1) GetEventWithContext(ctx contex pathParamsMap := map[string]string{ "instance_id": *getEventOptions.InstanceID, - "event_id": *getEventOptions.EventID, + "event_id": *getEventOptions.EventID, } builder := core.NewRequestBuilder(core.GET) @@ -1315,21 +1268,18 @@ func (drAutomationService *DrAutomationServiceV1) GetEventWithContext(ctx contex return } - for headerName, headerValue := range getEventOptions.Headers { + sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetEvent") + for headerName, headerValue := range sdkHeaders { builder.AddHeader(headerName, headerValue) } - sdkHeaders := common.GetSdkHeaders("dr_automation_service", "V1", "GetEvent") - for headerName, headerValue := range sdkHeaders { + for headerName, headerValue := range getEventOptions.Headers { builder.AddHeader(headerName, headerValue) } builder.AddHeader("Accept", "application/json") if getEventOptions.AcceptLanguage != nil { builder.AddHeader("Accept-Language", fmt.Sprint(*getEventOptions.AcceptLanguage)) } - if getEventOptions.IfNoneMatch != nil { - builder.AddHeader("If-None-Match", fmt.Sprint(*getEventOptions.IfNoneMatch)) - } request, err := builder.Build() if err != nil { @@ -1370,9 +1320,6 @@ type CreateApikeyOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -1381,7 +1328,7 @@ type CreateApikeyOptions struct { func (*DrAutomationServiceV1) NewCreateApikeyOptions(instanceID string, apiKey string) *CreateApikeyOptions { return &CreateApikeyOptions{ InstanceID: core.StringPtr(instanceID), - APIKey: core.StringPtr(apiKey), + APIKey: core.StringPtr(apiKey), } } @@ -1403,12 +1350,6 @@ func (_options *CreateApikeyOptions) SetAcceptLanguage(acceptLanguage string) *C return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *CreateApikeyOptions) SetIfNoneMatch(ifNoneMatch string) *CreateApikeyOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *CreateApikeyOptions) SetHeaders(param map[string]string) *CreateApikeyOptions { options.Headers = param @@ -1420,6 +1361,24 @@ type CreateManageDrOptions struct { // instance id of instance to provision. InstanceID *string `json:"instance_id" validate:"required,ne="` + // The location or data center identifier where the service instance is deployed. + LocationID *string `json:"location_id" validate:"required"` + + // The machine type used for deploying orchestrator. + MachineType *string `json:"machine_type" validate:"required"` + + // The cloud location where your orchestator need to be created. + OrchestratorLocationType *string `json:"orchestrator_location_type" validate:"required"` + + // The username used for the orchestrator. + OrchestratorName *string `json:"orchestrator_name" validate:"required"` + + // The password that you can use to access your orchestrator. + OrchestratorPassword *string `json:"orchestrator_password" validate:"required"` + + // The unique identifier orchestrator workspace. + OrchestratorWorkspaceID *string `json:"orchestrator_workspace_id" validate:"required"` + // The api Key of the service instance for deploying the disaster recovery service. APIKey *string `json:"api_key,omitempty"` @@ -1432,30 +1391,9 @@ type CreateManageDrOptions struct { // The global unique identifier of the service instance. GUID *string `json:"guid,omitempty"` - // The location or data center identifier where the service instance is deployed. - LocationID *string `json:"location_id,omitempty"` - - // The machine type used for deploying orchestrator. - MachineType *string `json:"machine_type,omitempty"` - // Indicates whether the orchestrator High Availability (HA) is enabled for the service instance. OrchestratorHa *bool `json:"orchestrator_ha,omitempty"` - // The cloud location where your orchestator need to be created. - OrchestratorLocationType *string `json:"orchestrator_location_type,omitempty"` - - // The username used for the orchestrator. - OrchestratorName *string `json:"orchestrator_name,omitempty"` - - // The password that you can use to access your orchestrator. - OrchestratorPassword *string `json:"orchestrator_password,omitempty"` - - // The unique identifier orchestrator workspace. - OrchestratorWorkspaceID *string `json:"orchestrator_workspace_id,omitempty"` - - // The location of the orchestrator workspace. - OrchestratorWorkspaceLocation *string `json:"orchestrator_workspace_location,omitempty"` - // Proxy IP for the Communication between Orchestrator and Service broker. ProxyIP *string `json:"proxy_ip,omitempty"` @@ -1465,9 +1403,6 @@ type CreateManageDrOptions struct { // The uniquie identifier of the associated IBM Cloud resource instance. ResourceInstance *string `json:"resource_instance,omitempty"` - // The unique identifier of the secondary workspace used for the disaster recovery. - SecondaryWorkspaceID *string `json:"secondary_workspace_id,omitempty"` - // The secret name or identifier used for retrieving credentials from secrets manager. Secret *string `json:"secret,omitempty"` @@ -1486,9 +1421,6 @@ type CreateManageDrOptions struct { // The unique identifier of the standby orchestrator workspace. StandbyOrchestratorWorkspaceID *string `json:"standby_orchestrator_workspace_id,omitempty"` - // The location of the standby orchestrator workspace. - StandbyOrchestratorWorkspaceLocation *string `json:"standby_orchestrator_workspace_location,omitempty"` - // The storage tier used for deploying standby orchestrator. StandbyTier *string `json:"standby_tier,omitempty"` @@ -1504,9 +1436,6 @@ type CreateManageDrOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // A value of true indicates that both the IBM Cloud platform and the requesting client support asynchronous // deprovisioning. AcceptsIncomplete *bool `json:"accepts_incomplete,omitempty"` @@ -1516,9 +1445,15 @@ type CreateManageDrOptions struct { } // NewCreateManageDrOptions : Instantiate CreateManageDrOptions -func (*DrAutomationServiceV1) NewCreateManageDrOptions(instanceID string) *CreateManageDrOptions { +func (*DrAutomationServiceV1) NewCreateManageDrOptions(instanceID string, locationID string, machineType string, orchestratorLocationType string, orchestratorName string, orchestratorPassword string, orchestratorWorkspaceID string) *CreateManageDrOptions { return &CreateManageDrOptions{ InstanceID: core.StringPtr(instanceID), + LocationID: core.StringPtr(locationID), + MachineType: core.StringPtr(machineType), + OrchestratorLocationType: core.StringPtr(orchestratorLocationType), + OrchestratorName: core.StringPtr(orchestratorName), + OrchestratorPassword: core.StringPtr(orchestratorPassword), + OrchestratorWorkspaceID: core.StringPtr(orchestratorWorkspaceID), } } @@ -1528,30 +1463,6 @@ func (_options *CreateManageDrOptions) SetInstanceID(instanceID string) *CreateM return _options } -// SetAPIKey : Allow user to set APIKey -func (_options *CreateManageDrOptions) SetAPIKey(apiKey string) *CreateManageDrOptions { - _options.APIKey = core.StringPtr(apiKey) - return _options -} - -// SetClientID : Allow user to set ClientID -func (_options *CreateManageDrOptions) SetClientID(clientID string) *CreateManageDrOptions { - _options.ClientID = core.StringPtr(clientID) - return _options -} - -// SetClientSecret : Allow user to set ClientSecret -func (_options *CreateManageDrOptions) SetClientSecret(clientSecret string) *CreateManageDrOptions { - _options.ClientSecret = core.StringPtr(clientSecret) - return _options -} - -// SetGUID : Allow user to set GUID -func (_options *CreateManageDrOptions) SetGUID(guid string) *CreateManageDrOptions { - _options.GUID = core.StringPtr(guid) - return _options -} - // SetLocationID : Allow user to set LocationID func (_options *CreateManageDrOptions) SetLocationID(locationID string) *CreateManageDrOptions { _options.LocationID = core.StringPtr(locationID) @@ -1564,12 +1475,6 @@ func (_options *CreateManageDrOptions) SetMachineType(machineType string) *Creat return _options } -// SetOrchestratorHa : Allow user to set OrchestratorHa -func (_options *CreateManageDrOptions) SetOrchestratorHa(orchestratorHa bool) *CreateManageDrOptions { - _options.OrchestratorHa = core.BoolPtr(orchestratorHa) - return _options -} - // SetOrchestratorLocationType : Allow user to set OrchestratorLocationType func (_options *CreateManageDrOptions) SetOrchestratorLocationType(orchestratorLocationType string) *CreateManageDrOptions { _options.OrchestratorLocationType = core.StringPtr(orchestratorLocationType) @@ -1594,9 +1499,33 @@ func (_options *CreateManageDrOptions) SetOrchestratorWorkspaceID(orchestratorWo return _options } -// SetOrchestratorWorkspaceLocation : Allow user to set OrchestratorWorkspaceLocation -func (_options *CreateManageDrOptions) SetOrchestratorWorkspaceLocation(orchestratorWorkspaceLocation string) *CreateManageDrOptions { - _options.OrchestratorWorkspaceLocation = core.StringPtr(orchestratorWorkspaceLocation) +// SetAPIKey : Allow user to set APIKey +func (_options *CreateManageDrOptions) SetAPIKey(apiKey string) *CreateManageDrOptions { + _options.APIKey = core.StringPtr(apiKey) + return _options +} + +// SetClientID : Allow user to set ClientID +func (_options *CreateManageDrOptions) SetClientID(clientID string) *CreateManageDrOptions { + _options.ClientID = core.StringPtr(clientID) + return _options +} + +// SetClientSecret : Allow user to set ClientSecret +func (_options *CreateManageDrOptions) SetClientSecret(clientSecret string) *CreateManageDrOptions { + _options.ClientSecret = core.StringPtr(clientSecret) + return _options +} + +// SetGUID : Allow user to set GUID +func (_options *CreateManageDrOptions) SetGUID(guid string) *CreateManageDrOptions { + _options.GUID = core.StringPtr(guid) + return _options +} + +// SetOrchestratorHa : Allow user to set OrchestratorHa +func (_options *CreateManageDrOptions) SetOrchestratorHa(orchestratorHa bool) *CreateManageDrOptions { + _options.OrchestratorHa = core.BoolPtr(orchestratorHa) return _options } @@ -1618,12 +1547,6 @@ func (_options *CreateManageDrOptions) SetResourceInstance(resourceInstance stri return _options } -// SetSecondaryWorkspaceID : Allow user to set SecondaryWorkspaceID -func (_options *CreateManageDrOptions) SetSecondaryWorkspaceID(secondaryWorkspaceID string) *CreateManageDrOptions { - _options.SecondaryWorkspaceID = core.StringPtr(secondaryWorkspaceID) - return _options -} - // SetSecret : Allow user to set Secret func (_options *CreateManageDrOptions) SetSecret(secret string) *CreateManageDrOptions { _options.Secret = core.StringPtr(secret) @@ -1660,12 +1583,6 @@ func (_options *CreateManageDrOptions) SetStandbyOrchestratorWorkspaceID(standby return _options } -// SetStandbyOrchestratorWorkspaceLocation : Allow user to set StandbyOrchestratorWorkspaceLocation -func (_options *CreateManageDrOptions) SetStandbyOrchestratorWorkspaceLocation(standbyOrchestratorWorkspaceLocation string) *CreateManageDrOptions { - _options.StandbyOrchestratorWorkspaceLocation = core.StringPtr(standbyOrchestratorWorkspaceLocation) - return _options -} - // SetStandbyTier : Allow user to set StandbyTier func (_options *CreateManageDrOptions) SetStandbyTier(standbyTier string) *CreateManageDrOptions { _options.StandbyTier = core.StringPtr(standbyTier) @@ -1696,12 +1613,6 @@ func (_options *CreateManageDrOptions) SetAcceptLanguage(acceptLanguage string) return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *CreateManageDrOptions) SetIfNoneMatch(ifNoneMatch string) *CreateManageDrOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetAcceptsIncomplete : Allow user to set AcceptsIncomplete func (_options *CreateManageDrOptions) SetAcceptsIncomplete(acceptsIncomplete bool) *CreateManageDrOptions { _options.AcceptsIncomplete = core.BoolPtr(acceptsIncomplete) @@ -1981,9 +1892,9 @@ type Event struct { // Constants associated with the Event.Level property. // Level of the event (notice, info, warning, error). const ( - EventLevelErrorConst = "error" - EventLevelInfoConst = "info" - EventLevelNoticeConst = "notice" + EventLevelErrorConst = "error" + EventLevelInfoConst = "info" + EventLevelNoticeConst = "notice" EventLevelWarningConst = "warning" ) @@ -2109,9 +2020,6 @@ type GetApikeyOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2135,12 +2043,6 @@ func (_options *GetApikeyOptions) SetAcceptLanguage(acceptLanguage string) *GetA return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetApikeyOptions) SetIfNoneMatch(ifNoneMatch string) *GetApikeyOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetApikeyOptions) SetHeaders(param map[string]string) *GetApikeyOptions { options.Headers = param @@ -2155,9 +2057,6 @@ type GetDrGrsLocationPairOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2181,12 +2080,6 @@ func (_options *GetDrGrsLocationPairOptions) SetAcceptLanguage(acceptLanguage st return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetDrGrsLocationPairOptions) SetIfNoneMatch(ifNoneMatch string) *GetDrGrsLocationPairOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetDrGrsLocationPairOptions) SetHeaders(param map[string]string) *GetDrGrsLocationPairOptions { options.Headers = param @@ -2201,9 +2094,6 @@ type GetDrLocationsOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2227,12 +2117,6 @@ func (_options *GetDrLocationsOptions) SetAcceptLanguage(acceptLanguage string) return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetDrLocationsOptions) SetIfNoneMatch(ifNoneMatch string) *GetDrLocationsOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetDrLocationsOptions) SetHeaders(param map[string]string) *GetDrLocationsOptions { options.Headers = param @@ -2265,9 +2149,6 @@ type GetDrManagedVMOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2291,12 +2172,6 @@ func (_options *GetDrManagedVMOptions) SetAcceptLanguage(acceptLanguage string) return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetDrManagedVMOptions) SetIfNoneMatch(ifNoneMatch string) *GetDrManagedVMOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetDrManagedVMOptions) SetHeaders(param map[string]string) *GetDrManagedVMOptions { options.Headers = param @@ -2311,9 +2186,6 @@ type GetDrSummaryOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2337,12 +2209,6 @@ func (_options *GetDrSummaryOptions) SetAcceptLanguage(acceptLanguage string) *G return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetDrSummaryOptions) SetIfNoneMatch(ifNoneMatch string) *GetDrSummaryOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetDrSummaryOptions) SetHeaders(param map[string]string) *GetDrSummaryOptions { options.Headers = param @@ -2360,9 +2226,6 @@ type GetEventOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2371,7 +2234,7 @@ type GetEventOptions struct { func (*DrAutomationServiceV1) NewGetEventOptions(instanceID string, eventID string) *GetEventOptions { return &GetEventOptions{ InstanceID: core.StringPtr(instanceID), - EventID: core.StringPtr(eventID), + EventID: core.StringPtr(eventID), } } @@ -2393,12 +2256,6 @@ func (_options *GetEventOptions) SetAcceptLanguage(acceptLanguage string) *GetEv return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetEventOptions) SetIfNoneMatch(ifNoneMatch string) *GetEventOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetEventOptions) SetHeaders(param map[string]string) *GetEventOptions { options.Headers = param @@ -2431,9 +2288,6 @@ type GetLastOperationOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2457,12 +2311,6 @@ func (_options *GetLastOperationOptions) SetAcceptLanguage(acceptLanguage string return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetLastOperationOptions) SetIfNoneMatch(ifNoneMatch string) *GetLastOperationOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetLastOperationOptions) SetHeaders(param map[string]string) *GetLastOperationOptions { options.Headers = param @@ -2480,9 +2328,6 @@ type GetMachineTypeOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // The standby Power virtual server workspace name. StandbyWorkspaceName *string `json:"standby_workspace_name,omitempty"` @@ -2493,7 +2338,7 @@ type GetMachineTypeOptions struct { // NewGetMachineTypeOptions : Instantiate GetMachineTypeOptions func (*DrAutomationServiceV1) NewGetMachineTypeOptions(instanceID string, primaryWorkspaceName string) *GetMachineTypeOptions { return &GetMachineTypeOptions{ - InstanceID: core.StringPtr(instanceID), + InstanceID: core.StringPtr(instanceID), PrimaryWorkspaceName: core.StringPtr(primaryWorkspaceName), } } @@ -2516,12 +2361,6 @@ func (_options *GetMachineTypeOptions) SetAcceptLanguage(acceptLanguage string) return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetMachineTypeOptions) SetIfNoneMatch(ifNoneMatch string) *GetMachineTypeOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetStandbyWorkspaceName : Allow user to set StandbyWorkspaceName func (_options *GetMachineTypeOptions) SetStandbyWorkspaceName(standbyWorkspaceName string) *GetMachineTypeOptions { _options.StandbyWorkspaceName = core.StringPtr(standbyWorkspaceName) @@ -2542,9 +2381,6 @@ type GetManageDrOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2568,12 +2404,6 @@ func (_options *GetManageDrOptions) SetAcceptLanguage(acceptLanguage string) *Ge return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetManageDrOptions) SetIfNoneMatch(ifNoneMatch string) *GetManageDrOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetManageDrOptions) SetHeaders(param map[string]string) *GetManageDrOptions { options.Headers = param @@ -2588,9 +2418,6 @@ type GetPowervsWorkspacesOptions struct { // Location ID value. LocationID *string `json:"location_id" validate:"required"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2615,12 +2442,6 @@ func (_options *GetPowervsWorkspacesOptions) SetLocationID(locationID string) *G return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *GetPowervsWorkspacesOptions) SetIfNoneMatch(ifNoneMatch string) *GetPowervsWorkspacesOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *GetPowervsWorkspacesOptions) SetHeaders(param map[string]string) *GetPowervsWorkspacesOptions { options.Headers = param @@ -2644,9 +2465,6 @@ type ListEventsOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -2688,12 +2506,6 @@ func (_options *ListEventsOptions) SetAcceptLanguage(acceptLanguage string) *Lis return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *ListEventsOptions) SetIfNoneMatch(ifNoneMatch string) *ListEventsOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *ListEventsOptions) SetHeaders(param map[string]string) *ListEventsOptions { options.Headers = param @@ -3368,9 +3180,6 @@ type UpdateApikeyOptions struct { // The language requested for the return document. AcceptLanguage *string `json:"Accept-Language,omitempty"` - // ETag for conditional requests (optional). - IfNoneMatch *string `json:"If-None-Match,omitempty"` - // Allows users to set headers on API requests. Headers map[string]string } @@ -3379,7 +3188,7 @@ type UpdateApikeyOptions struct { func (*DrAutomationServiceV1) NewUpdateApikeyOptions(instanceID string, apiKey string) *UpdateApikeyOptions { return &UpdateApikeyOptions{ InstanceID: core.StringPtr(instanceID), - APIKey: core.StringPtr(apiKey), + APIKey: core.StringPtr(apiKey), } } @@ -3401,12 +3210,6 @@ func (_options *UpdateApikeyOptions) SetAcceptLanguage(acceptLanguage string) *U return _options } -// SetIfNoneMatch : Allow user to set IfNoneMatch -func (_options *UpdateApikeyOptions) SetIfNoneMatch(ifNoneMatch string) *UpdateApikeyOptions { - _options.IfNoneMatch = core.StringPtr(ifNoneMatch) - return _options -} - // SetHeaders : Allow user to set Headers func (options *UpdateApikeyOptions) SetHeaders(param map[string]string) *UpdateApikeyOptions { options.Headers = param diff --git a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_examples_test.go b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_examples_test.go index 9398ff5c8c..f494e310e6 100644 --- a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_examples_test.go +++ b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_examples_test.go @@ -105,7 +105,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_apikey getApikeyOptions := drAutomationServiceService.NewGetApikeyOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) validationKeyResponse, response, err := drAutomationServiceService.GetApikey(getApikeyOptions) @@ -126,7 +126,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-create_apikey createApikeyOptions := drAutomationServiceService.NewCreateApikeyOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", "abcdefrg_izklmnop_fxbEED", ) @@ -148,7 +148,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-update_apikey updateApikeyOptions := drAutomationServiceService.NewUpdateApikeyOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", "adfadfdsafsdfdsf", ) @@ -170,7 +170,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_dr_grs_location_pair getDrGrsLocationPairOptions := drAutomationServiceService.NewGetDrGrsLocationPairOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) getGrsLocationPairResponse, response, err := drAutomationServiceService.GetDrGrsLocationPair(getDrGrsLocationPairOptions) @@ -191,7 +191,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_dr_locations getDrLocationsOptions := drAutomationServiceService.NewGetDrLocationsOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) getDrLocationsResponse, response, err := drAutomationServiceService.GetDrLocations(getDrLocationsOptions) @@ -212,7 +212,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_dr_managed_vm getDrManagedVMOptions := drAutomationServiceService.NewGetDrManagedVMOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) managedVMMapResponse, response, err := drAutomationServiceService.GetDrManagedVM(getDrManagedVMOptions) @@ -233,7 +233,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_dr_summary getDrSummaryOptions := drAutomationServiceService.NewGetDrSummaryOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) drAutomationGetSummaryResponse, response, err := drAutomationServiceService.GetDrSummary(getDrSummaryOptions) @@ -254,7 +254,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_machine_type getMachineTypeOptions := drAutomationServiceService.NewGetMachineTypeOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", "Test-workspace-wdc06", ) getMachineTypeOptions.SetStandbyWorkspaceName("Test-workspace-wdc07") @@ -277,7 +277,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_powervs_workspaces getPowervsWorkspacesOptions := drAutomationServiceService.NewGetPowervsWorkspacesOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", "testString", ) @@ -299,7 +299,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_manage_dr getManageDrOptions := drAutomationServiceService.NewGetManageDrOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) serviceInstanceManageDr, response, err := drAutomationServiceService.GetManageDr(getManageDrOptions) @@ -320,7 +320,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-create_manage_dr createManageDrOptions := drAutomationServiceService.NewCreateManageDrOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) createManageDrOptions.SetOrchestratorHa(true) createManageDrOptions.SetOrchestratorLocationType("off-premises") @@ -361,7 +361,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_last_operation getLastOperationOptions := drAutomationServiceService.NewGetLastOperationOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) serviceInstanceStatus, response, err := drAutomationServiceService.GetLastOperation(getLastOperationOptions) @@ -382,7 +382,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-list_events listEventsOptions := drAutomationServiceService.NewListEventsOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", ) listEventsOptions.SetTime("2025-06-19T23:59:59Z") listEventsOptions.SetFromTime("2025-06-19T00:00:00Z") @@ -406,7 +406,7 @@ var _ = Describe(`DrAutomationServiceV1 Examples Tests`, func() { // begin-get_event getEventOptions := drAutomationServiceService.NewGetEventOptions( - "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::", + "123456d3-1122-3344-b67d-4389b44b7bf9", "00116b2a-9326-4024-839e-fb5364b76898", ) diff --git a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_integration_test.go b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_integration_test.go index 357495d7dc..fe66e72c98 100644 --- a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_integration_test.go +++ b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_integration_test.go @@ -42,10 +42,10 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { const externalConfigFile = "../dr_automation_service_v1.env" var ( - err error + err error drAutomationServiceService *drautomationservicev1.DrAutomationServiceV1 - serviceURL string - config map[string]string + serviceURL string + config map[string]string ) var shouldSkipTest = func() { @@ -97,9 +97,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetApikey(getApikeyOptions *GetApikeyOptions)`, func() { getApikeyOptions := &drautomationservicev1.GetApikeyOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } validationKeyResponse, response, err := drAutomationServiceService.GetApikey(getApikeyOptions) @@ -115,10 +114,9 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`CreateApikey(createApikeyOptions *CreateApikeyOptions)`, func() { createApikeyOptions := &drautomationservicev1.CreateApikeyOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), - APIKey: core.StringPtr("abcdefrg_izklmnop_fxbEED"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), + APIKey: core.StringPtr("abcdefrg_izklmnop_fxbEED"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } validationKeyResponse, response, err := drAutomationServiceService.CreateApikey(createApikeyOptions) @@ -134,10 +132,9 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`UpdateApikey(updateApikeyOptions *UpdateApikeyOptions)`, func() { updateApikeyOptions := &drautomationservicev1.UpdateApikeyOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), - APIKey: core.StringPtr("adfadfdsafsdfdsf"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), + APIKey: core.StringPtr("adfadfdsafsdfdsf"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } validationKeyResponse, response, err := drAutomationServiceService.UpdateApikey(updateApikeyOptions) @@ -153,9 +150,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetDrGrsLocationPair(getDrGrsLocationPairOptions *GetDrGrsLocationPairOptions)`, func() { getDrGrsLocationPairOptions := &drautomationservicev1.GetDrGrsLocationPairOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } getGrsLocationPairResponse, response, err := drAutomationServiceService.GetDrGrsLocationPair(getDrGrsLocationPairOptions) @@ -171,9 +167,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetDrLocations(getDrLocationsOptions *GetDrLocationsOptions)`, func() { getDrLocationsOptions := &drautomationservicev1.GetDrLocationsOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } getDrLocationsResponse, response, err := drAutomationServiceService.GetDrLocations(getDrLocationsOptions) @@ -189,9 +184,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetDrManagedVM(getDrManagedVMOptions *GetDrManagedVMOptions)`, func() { getDrManagedVMOptions := &drautomationservicev1.GetDrManagedVMOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } managedVMMapResponse, response, err := drAutomationServiceService.GetDrManagedVM(getDrManagedVMOptions) @@ -207,9 +201,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetDrSummary(getDrSummaryOptions *GetDrSummaryOptions)`, func() { getDrSummaryOptions := &drautomationservicev1.GetDrSummaryOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } drAutomationGetSummaryResponse, response, err := drAutomationServiceService.GetDrSummary(getDrSummaryOptions) @@ -225,10 +218,9 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetMachineType(getMachineTypeOptions *GetMachineTypeOptions)`, func() { getMachineTypeOptions := &drautomationservicev1.GetMachineTypeOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), PrimaryWorkspaceName: core.StringPtr("Test-workspace-wdc06"), - AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), + AcceptLanguage: core.StringPtr("testString"), StandbyWorkspaceName: core.StringPtr("Test-workspace-wdc07"), } @@ -245,9 +237,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetPowervsWorkspaces(getPowervsWorkspacesOptions *GetPowervsWorkspacesOptions)`, func() { getPowervsWorkspacesOptions := &drautomationservicev1.GetPowervsWorkspacesOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), - LocationID: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), + LocationID: core.StringPtr("testString"), } drData, response, err := drAutomationServiceService.GetPowervsWorkspaces(getPowervsWorkspacesOptions) @@ -263,9 +254,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetManageDr(getManageDrOptions *GetManageDrOptions)`, func() { getManageDrOptions := &drautomationservicev1.GetManageDrOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } serviceInstanceManageDr, response, err := drAutomationServiceService.GetManageDr(getManageDrOptions) @@ -281,37 +271,33 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`CreateManageDr(createManageDrOptions *CreateManageDrOptions)`, func() { createManageDrOptions := &drautomationservicev1.CreateManageDrOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), - APIKey: core.StringPtr("testString"), - ClientID: core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122"), - ClientSecret: core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC"), - GUID: core.StringPtr("123e4567-e89b-12d3-a456-426614174000"), - LocationID: core.StringPtr("dal10"), - MachineType: core.StringPtr("bx2-4x16"), - OrchestratorHa: core.BoolPtr(true), - OrchestratorLocationType: core.StringPtr("off-premises"), - OrchestratorName: core.StringPtr("adminUser"), - OrchestratorPassword: core.StringPtr("testString"), - OrchestratorWorkspaceID: core.StringPtr("orch-workspace-01"), - OrchestratorWorkspaceLocation: core.StringPtr("us-south"), - ProxyIP: core.StringPtr("10.40.30.10:8888"), - RegionID: core.StringPtr("us-south"), - ResourceInstance: core.StringPtr("crn:v1:bluemix:public:resource-controller::res123"), - SecondaryWorkspaceID: core.StringPtr("secondary-workspace789"), - Secret: core.StringPtr("testString"), - SecretGroup: core.StringPtr("default-secret-group"), - SSHKeyName: core.StringPtr("my-ssh-key"), - StandbyMachineType: core.StringPtr("bx2-8x32"), - StandbyOrchestratorName: core.StringPtr("standbyAdmin"), - StandbyOrchestratorWorkspaceID: core.StringPtr("orch-standby-02"), - StandbyOrchestratorWorkspaceLocation: core.StringPtr("us-east"), - StandbyTier: core.StringPtr("Premium"), - TenantName: core.StringPtr("xxx.ibm.com"), - Tier: core.StringPtr("Standard"), - StandByRedeploy: core.StringPtr("testString"), - AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), - AcceptsIncomplete: core.BoolPtr(true), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), + LocationID: core.StringPtr("dal10"), + MachineType: core.StringPtr("bx2-4x16"), + OrchestratorLocationType: core.StringPtr("off-premises"), + OrchestratorName: core.StringPtr("adminUser"), + OrchestratorPassword: core.StringPtr("testString"), + OrchestratorWorkspaceID: core.StringPtr("orch-workspace-01"), + APIKey: core.StringPtr("testString"), + ClientID: core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234"), + ClientSecret: core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh"), + GUID: core.StringPtr("123e4567-e89b-12d3-a456-426614174000"), + OrchestratorHa: core.BoolPtr(true), + ProxyIP: core.StringPtr("10.40.30.10:8888"), + RegionID: core.StringPtr("us-south"), + ResourceInstance: core.StringPtr("crn:v1:bluemix:public:resource-controller::res123"), + Secret: core.StringPtr("testString"), + SecretGroup: core.StringPtr("default-secret-group"), + SSHKeyName: core.StringPtr("my-ssh-key"), + StandbyMachineType: core.StringPtr("bx2-8x32"), + StandbyOrchestratorName: core.StringPtr("standbyAdmin"), + StandbyOrchestratorWorkspaceID: core.StringPtr("orch-standby-02"), + StandbyTier: core.StringPtr("Premium"), + TenantName: core.StringPtr("xxx.ibm.com"), + Tier: core.StringPtr("Standard"), + StandByRedeploy: core.StringPtr("testString"), + AcceptLanguage: core.StringPtr("testString"), + AcceptsIncomplete: core.BoolPtr(true), } serviceInstanceManageDr, response, err := drAutomationServiceService.CreateManageDr(createManageDrOptions) @@ -327,9 +313,8 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetLastOperation(getLastOperationOptions *GetLastOperationOptions)`, func() { getLastOperationOptions := &drautomationservicev1.GetLastOperationOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } serviceInstanceStatus, response, err := drAutomationServiceService.GetLastOperation(getLastOperationOptions) @@ -345,12 +330,11 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`ListEvents(listEventsOptions *ListEventsOptions)`, func() { listEventsOptions := &drautomationservicev1.ListEventsOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), - Time: core.StringPtr("2025-06-19T23:59:59Z"), - FromTime: core.StringPtr("2025-06-19T00:00:00Z"), - ToTime: core.StringPtr("2025-06-19T23:59:59Z"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), + Time: core.StringPtr("2025-06-19T23:59:59Z"), + FromTime: core.StringPtr("2025-06-19T00:00:00Z"), + ToTime: core.StringPtr("2025-06-19T23:59:59Z"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } eventCollection, response, err := drAutomationServiceService.ListEvents(listEventsOptions) @@ -366,10 +350,9 @@ var _ = Describe(`DrAutomationServiceV1 Integration Tests`, func() { }) It(`GetEvent(getEventOptions *GetEventOptions)`, func() { getEventOptions := &drautomationservicev1.GetEventOptions{ - InstanceID: core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"), - EventID: core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898"), + InstanceID: core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"), + EventID: core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898"), AcceptLanguage: core.StringPtr("testString"), - IfNoneMatch: core.StringPtr("testString"), } event, response, err := drAutomationServiceService.GetEvent(getEventOptions) diff --git a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_test.go b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_test.go index 9b15bd6df9..1f516adbde 100644 --- a/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_test.go +++ b/ibm/service/drautomationservice/dra-go-sdk/drautomationservicev1/dr_automation_service_v1_test.go @@ -67,13 +67,14 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Context(`Using external config, construct service client instances`, func() { // Map containing environment variables used in testing. var testEnvironment = map[string]string{ - "DR_AUTOMATION_SERVICE_URL": "https://drautomationservicev1/api", + "DR_AUTOMATION_SERVICE_URL": "https://drautomationservicev1/api", "DR_AUTOMATION_SERVICE_AUTH_TYPE": "noauth", } It(`Create service client using external config successfully`, func() { SetTestEnvironment(testEnvironment) - drAutomationServiceService, serviceErr := drautomationservicev1.NewDrAutomationServiceV1UsingExternalConfig(&drautomationservicev1.DrAutomationServiceV1Options{}) + drAutomationServiceService, serviceErr := drautomationservicev1.NewDrAutomationServiceV1UsingExternalConfig(&drautomationservicev1.DrAutomationServiceV1Options{ + }) Expect(drAutomationServiceService).ToNot(BeNil()) Expect(serviceErr).To(BeNil()) ClearTestEnvironment(testEnvironment) @@ -102,7 +103,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) It(`Create service client using external config and set url programatically successfully`, func() { SetTestEnvironment(testEnvironment) - drAutomationServiceService, serviceErr := drautomationservicev1.NewDrAutomationServiceV1UsingExternalConfig(&drautomationservicev1.DrAutomationServiceV1Options{}) + drAutomationServiceService, serviceErr := drautomationservicev1.NewDrAutomationServiceV1UsingExternalConfig(&drautomationservicev1.DrAutomationServiceV1Options{ + }) err := drAutomationServiceService.SetServiceURL("https://testService/api") Expect(err).To(BeNil()) Expect(drAutomationServiceService).ToNot(BeNil()) @@ -120,12 +122,13 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Context(`Using external config, construct service client instances with error: Invalid Auth`, func() { // Map containing environment variables used in testing. var testEnvironment = map[string]string{ - "DR_AUTOMATION_SERVICE_URL": "https://drautomationservicev1/api", + "DR_AUTOMATION_SERVICE_URL": "https://drautomationservicev1/api", "DR_AUTOMATION_SERVICE_AUTH_TYPE": "someOtherAuth", } SetTestEnvironment(testEnvironment) - drAutomationServiceService, serviceErr := drautomationservicev1.NewDrAutomationServiceV1UsingExternalConfig(&drautomationservicev1.DrAutomationServiceV1Options{}) + drAutomationServiceService, serviceErr := drautomationservicev1.NewDrAutomationServiceV1UsingExternalConfig(&drautomationservicev1.DrAutomationServiceV1Options{ + }) It(`Instantiate service client with error`, func() { Expect(drAutomationServiceService).To(BeNil()) @@ -136,7 +139,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Context(`Using external config, construct service client instances with error: Invalid URL`, func() { // Map containing environment variables used in testing. var testEnvironment = map[string]string{ - "DR_AUTOMATION_SERVICE_AUTH_TYPE": "NOAuth", + "DR_AUTOMATION_SERVICE_AUTH_TYPE": "NOAuth", } SetTestEnvironment(testEnvironment) @@ -162,7 +165,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetApikey(getApikeyOptions *GetApikeyOptions) - Operation response error`, func() { - getApikeyPath := "/drautomation/v1/apikey/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getApikeyPath := "/drautomation/v1/apikey/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -173,8 +176,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -190,9 +191,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetApikeyOptions model getApikeyOptionsModel := new(drautomationservicev1.GetApikeyOptions) - getApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - getApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") getApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetApikey(getApikeyOptionsModel) @@ -213,7 +213,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetApikey(getApikeyOptions *GetApikeyOptions)`, func() { - getApikeyPath := "/drautomation/v1/apikey/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getApikeyPath := "/drautomation/v1/apikey/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -225,8 +225,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -247,9 +245,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetApikeyOptions model getApikeyOptionsModel := new(drautomationservicev1.GetApikeyOptions) - getApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - getApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") getApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -288,8 +285,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -312,9 +307,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetApikeyOptions model getApikeyOptionsModel := new(drautomationservicev1.GetApikeyOptions) - getApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - getApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") getApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -334,9 +328,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetApikeyOptions model getApikeyOptionsModel := new(drautomationservicev1.GetApikeyOptions) - getApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - getApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") getApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -377,9 +370,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetApikeyOptions model getApikeyOptionsModel := new(drautomationservicev1.GetApikeyOptions) - getApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - getApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") getApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -396,7 +388,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`CreateApikey(createApikeyOptions *CreateApikeyOptions) - Operation response error`, func() { - createApikeyPath := "/drautomation/v1/apikey/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + createApikeyPath := "/drautomation/v1/apikey/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -407,8 +399,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("POST")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -424,10 +414,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateApikeyOptions model createApikeyOptionsModel := new(drautomationservicev1.CreateApikeyOptions) - createApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + createApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createApikeyOptionsModel.APIKey = core.StringPtr("abcdefrg_izklmnop_fxbEED") createApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - createApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") createApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.CreateApikey(createApikeyOptionsModel) @@ -448,7 +437,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`CreateApikey(createApikeyOptions *CreateApikeyOptions)`, func() { - createApikeyPath := "/drautomation/v1/apikey/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + createApikeyPath := "/drautomation/v1/apikey/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -476,8 +465,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -498,10 +485,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateApikeyOptions model createApikeyOptionsModel := new(drautomationservicev1.CreateApikeyOptions) - createApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + createApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createApikeyOptionsModel.APIKey = core.StringPtr("abcdefrg_izklmnop_fxbEED") createApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - createApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") createApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -556,8 +542,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -580,10 +564,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateApikeyOptions model createApikeyOptionsModel := new(drautomationservicev1.CreateApikeyOptions) - createApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + createApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createApikeyOptionsModel.APIKey = core.StringPtr("abcdefrg_izklmnop_fxbEED") createApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - createApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") createApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -603,10 +586,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateApikeyOptions model createApikeyOptionsModel := new(drautomationservicev1.CreateApikeyOptions) - createApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + createApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createApikeyOptionsModel.APIKey = core.StringPtr("abcdefrg_izklmnop_fxbEED") createApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - createApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") createApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -647,10 +629,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateApikeyOptions model createApikeyOptionsModel := new(drautomationservicev1.CreateApikeyOptions) - createApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + createApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createApikeyOptionsModel.APIKey = core.StringPtr("abcdefrg_izklmnop_fxbEED") createApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - createApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") createApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -667,7 +648,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`UpdateApikey(updateApikeyOptions *UpdateApikeyOptions) - Operation response error`, func() { - updateApikeyPath := "/drautomation/v1/apikey/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + updateApikeyPath := "/drautomation/v1/apikey/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -678,8 +659,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("PUT")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -695,10 +674,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the UpdateApikeyOptions model updateApikeyOptionsModel := new(drautomationservicev1.UpdateApikeyOptions) - updateApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + updateApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") updateApikeyOptionsModel.APIKey = core.StringPtr("adfadfdsafsdfdsf") updateApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - updateApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") updateApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.UpdateApikey(updateApikeyOptionsModel) @@ -719,7 +697,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`UpdateApikey(updateApikeyOptions *UpdateApikeyOptions)`, func() { - updateApikeyPath := "/drautomation/v1/apikey/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + updateApikeyPath := "/drautomation/v1/apikey/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -747,8 +725,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -769,10 +745,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the UpdateApikeyOptions model updateApikeyOptionsModel := new(drautomationservicev1.UpdateApikeyOptions) - updateApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + updateApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") updateApikeyOptionsModel.APIKey = core.StringPtr("adfadfdsafsdfdsf") updateApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - updateApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") updateApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -827,8 +802,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -851,10 +824,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the UpdateApikeyOptions model updateApikeyOptionsModel := new(drautomationservicev1.UpdateApikeyOptions) - updateApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + updateApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") updateApikeyOptionsModel.APIKey = core.StringPtr("adfadfdsafsdfdsf") updateApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - updateApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") updateApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -874,10 +846,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the UpdateApikeyOptions model updateApikeyOptionsModel := new(drautomationservicev1.UpdateApikeyOptions) - updateApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + updateApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") updateApikeyOptionsModel.APIKey = core.StringPtr("adfadfdsafsdfdsf") updateApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - updateApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") updateApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -918,10 +889,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the UpdateApikeyOptions model updateApikeyOptionsModel := new(drautomationservicev1.UpdateApikeyOptions) - updateApikeyOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + updateApikeyOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") updateApikeyOptionsModel.APIKey = core.StringPtr("adfadfdsafsdfdsf") updateApikeyOptionsModel.AcceptLanguage = core.StringPtr("testString") - updateApikeyOptionsModel.IfNoneMatch = core.StringPtr("testString") updateApikeyOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -938,7 +908,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrGrsLocationPair(getDrGrsLocationPairOptions *GetDrGrsLocationPairOptions) - Operation response error`, func() { - getDrGrsLocationPairPath := "/drautomation/v1/dr_grs_location_pairs/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrGrsLocationPairPath := "/drautomation/v1/dr_grs_location_pairs/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -949,8 +919,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -966,9 +934,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrGrsLocationPairOptions model getDrGrsLocationPairOptionsModel := new(drautomationservicev1.GetDrGrsLocationPairOptions) - getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrGrsLocationPairOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrGrsLocationPairOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrGrsLocationPairOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetDrGrsLocationPair(getDrGrsLocationPairOptionsModel) @@ -989,7 +956,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrGrsLocationPair(getDrGrsLocationPairOptions *GetDrGrsLocationPairOptions)`, func() { - getDrGrsLocationPairPath := "/drautomation/v1/dr_grs_location_pairs/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrGrsLocationPairPath := "/drautomation/v1/dr_grs_location_pairs/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1001,8 +968,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -1023,9 +988,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrGrsLocationPairOptions model getDrGrsLocationPairOptionsModel := new(drautomationservicev1.GetDrGrsLocationPairOptions) - getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrGrsLocationPairOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrGrsLocationPairOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrGrsLocationPairOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -1064,8 +1028,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -1088,9 +1050,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrGrsLocationPairOptions model getDrGrsLocationPairOptionsModel := new(drautomationservicev1.GetDrGrsLocationPairOptions) - getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrGrsLocationPairOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrGrsLocationPairOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrGrsLocationPairOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -1110,9 +1071,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrGrsLocationPairOptions model getDrGrsLocationPairOptionsModel := new(drautomationservicev1.GetDrGrsLocationPairOptions) - getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrGrsLocationPairOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrGrsLocationPairOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrGrsLocationPairOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -1153,9 +1113,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrGrsLocationPairOptions model getDrGrsLocationPairOptionsModel := new(drautomationservicev1.GetDrGrsLocationPairOptions) - getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrGrsLocationPairOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrGrsLocationPairOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrGrsLocationPairOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrGrsLocationPairOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -1172,7 +1131,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrLocations(getDrLocationsOptions *GetDrLocationsOptions) - Operation response error`, func() { - getDrLocationsPath := "/drautomation/v1/dr_locations/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrLocationsPath := "/drautomation/v1/dr_locations/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1183,8 +1142,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -1200,9 +1157,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrLocationsOptions model getDrLocationsOptionsModel := new(drautomationservicev1.GetDrLocationsOptions) - getDrLocationsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrLocationsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrLocationsOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrLocationsOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrLocationsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetDrLocations(getDrLocationsOptionsModel) @@ -1223,7 +1179,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrLocations(getDrLocationsOptions *GetDrLocationsOptions)`, func() { - getDrLocationsPath := "/drautomation/v1/dr_locations/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrLocationsPath := "/drautomation/v1/dr_locations/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1235,8 +1191,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -1257,9 +1211,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrLocationsOptions model getDrLocationsOptionsModel := new(drautomationservicev1.GetDrLocationsOptions) - getDrLocationsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrLocationsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrLocationsOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrLocationsOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrLocationsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -1298,8 +1251,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -1322,9 +1273,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrLocationsOptions model getDrLocationsOptionsModel := new(drautomationservicev1.GetDrLocationsOptions) - getDrLocationsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrLocationsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrLocationsOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrLocationsOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrLocationsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -1344,9 +1294,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrLocationsOptions model getDrLocationsOptionsModel := new(drautomationservicev1.GetDrLocationsOptions) - getDrLocationsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrLocationsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrLocationsOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrLocationsOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrLocationsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -1387,9 +1336,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrLocationsOptions model getDrLocationsOptionsModel := new(drautomationservicev1.GetDrLocationsOptions) - getDrLocationsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrLocationsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrLocationsOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrLocationsOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrLocationsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -1406,7 +1354,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrManagedVM(getDrManagedVMOptions *GetDrManagedVMOptions) - Operation response error`, func() { - getDrManagedVMPath := "/drautomation/v1/dr_managed_vms/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrManagedVMPath := "/drautomation/v1/dr_managed_vms/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1417,8 +1365,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -1434,9 +1380,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrManagedVMOptions model getDrManagedVMOptionsModel := new(drautomationservicev1.GetDrManagedVMOptions) - getDrManagedVMOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrManagedVMOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrManagedVMOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrManagedVMOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrManagedVMOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetDrManagedVM(getDrManagedVMOptionsModel) @@ -1457,7 +1402,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrManagedVM(getDrManagedVMOptions *GetDrManagedVMOptions)`, func() { - getDrManagedVMPath := "/drautomation/v1/dr_managed_vms/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrManagedVMPath := "/drautomation/v1/dr_managed_vms/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1469,8 +1414,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -1491,9 +1434,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrManagedVMOptions model getDrManagedVMOptionsModel := new(drautomationservicev1.GetDrManagedVMOptions) - getDrManagedVMOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrManagedVMOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrManagedVMOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrManagedVMOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrManagedVMOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -1532,8 +1474,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -1556,9 +1496,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrManagedVMOptions model getDrManagedVMOptionsModel := new(drautomationservicev1.GetDrManagedVMOptions) - getDrManagedVMOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrManagedVMOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrManagedVMOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrManagedVMOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrManagedVMOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -1578,9 +1517,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrManagedVMOptions model getDrManagedVMOptionsModel := new(drautomationservicev1.GetDrManagedVMOptions) - getDrManagedVMOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrManagedVMOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrManagedVMOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrManagedVMOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrManagedVMOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -1621,9 +1559,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrManagedVMOptions model getDrManagedVMOptionsModel := new(drautomationservicev1.GetDrManagedVMOptions) - getDrManagedVMOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrManagedVMOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrManagedVMOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrManagedVMOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrManagedVMOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -1640,7 +1577,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrSummary(getDrSummaryOptions *GetDrSummaryOptions) - Operation response error`, func() { - getDrSummaryPath := "/drautomation/v1/dr_summary/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrSummaryPath := "/drautomation/v1/dr_summary/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1651,8 +1588,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -1668,9 +1603,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrSummaryOptions model getDrSummaryOptionsModel := new(drautomationservicev1.GetDrSummaryOptions) - getDrSummaryOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrSummaryOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrSummaryOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrSummaryOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrSummaryOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetDrSummary(getDrSummaryOptionsModel) @@ -1691,7 +1625,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetDrSummary(getDrSummaryOptions *GetDrSummaryOptions)`, func() { - getDrSummaryPath := "/drautomation/v1/dr_summary/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getDrSummaryPath := "/drautomation/v1/dr_summary/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1703,8 +1637,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -1725,9 +1657,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrSummaryOptions model getDrSummaryOptionsModel := new(drautomationservicev1.GetDrSummaryOptions) - getDrSummaryOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrSummaryOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrSummaryOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrSummaryOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrSummaryOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -1766,8 +1697,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -1790,9 +1719,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrSummaryOptions model getDrSummaryOptionsModel := new(drautomationservicev1.GetDrSummaryOptions) - getDrSummaryOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrSummaryOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrSummaryOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrSummaryOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrSummaryOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -1812,9 +1740,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrSummaryOptions model getDrSummaryOptionsModel := new(drautomationservicev1.GetDrSummaryOptions) - getDrSummaryOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrSummaryOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrSummaryOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrSummaryOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrSummaryOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -1855,9 +1782,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetDrSummaryOptions model getDrSummaryOptionsModel := new(drautomationservicev1.GetDrSummaryOptions) - getDrSummaryOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrSummaryOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getDrSummaryOptionsModel.AcceptLanguage = core.StringPtr("testString") - getDrSummaryOptionsModel.IfNoneMatch = core.StringPtr("testString") getDrSummaryOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -1874,7 +1800,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetMachineType(getMachineTypeOptions *GetMachineTypeOptions) - Operation response error`, func() { - getMachineTypePath := "/drautomation/v1/machinetypes/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getMachineTypePath := "/drautomation/v1/machinetypes/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1885,8 +1811,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["primary_workspace_name"]).To(Equal([]string{"Test-workspace-wdc06"})) Expect(req.URL.Query()["standby_workspace_name"]).To(Equal([]string{"Test-workspace-wdc07"})) res.Header().Set("Content-type", "application/json") @@ -1904,10 +1828,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetMachineTypeOptions model getMachineTypeOptionsModel := new(drautomationservicev1.GetMachineTypeOptions) - getMachineTypeOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getMachineTypeOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getMachineTypeOptionsModel.PrimaryWorkspaceName = core.StringPtr("Test-workspace-wdc06") getMachineTypeOptionsModel.AcceptLanguage = core.StringPtr("testString") - getMachineTypeOptionsModel.IfNoneMatch = core.StringPtr("testString") getMachineTypeOptionsModel.StandbyWorkspaceName = core.StringPtr("Test-workspace-wdc07") getMachineTypeOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response @@ -1929,7 +1852,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetMachineType(getMachineTypeOptions *GetMachineTypeOptions)`, func() { - getMachineTypePath := "/drautomation/v1/machinetypes/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getMachineTypePath := "/drautomation/v1/machinetypes/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -1941,8 +1864,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["primary_workspace_name"]).To(Equal([]string{"Test-workspace-wdc06"})) Expect(req.URL.Query()["standby_workspace_name"]).To(Equal([]string{"Test-workspace-wdc07"})) // Sleep a short time to support a timeout test @@ -1965,10 +1886,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetMachineTypeOptions model getMachineTypeOptionsModel := new(drautomationservicev1.GetMachineTypeOptions) - getMachineTypeOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getMachineTypeOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getMachineTypeOptionsModel.PrimaryWorkspaceName = core.StringPtr("Test-workspace-wdc06") getMachineTypeOptionsModel.AcceptLanguage = core.StringPtr("testString") - getMachineTypeOptionsModel.IfNoneMatch = core.StringPtr("testString") getMachineTypeOptionsModel.StandbyWorkspaceName = core.StringPtr("Test-workspace-wdc07") getMachineTypeOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} @@ -2008,8 +1928,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["primary_workspace_name"]).To(Equal([]string{"Test-workspace-wdc06"})) Expect(req.URL.Query()["standby_workspace_name"]).To(Equal([]string{"Test-workspace-wdc07"})) // Set mock response @@ -2034,10 +1952,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetMachineTypeOptions model getMachineTypeOptionsModel := new(drautomationservicev1.GetMachineTypeOptions) - getMachineTypeOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getMachineTypeOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getMachineTypeOptionsModel.PrimaryWorkspaceName = core.StringPtr("Test-workspace-wdc06") getMachineTypeOptionsModel.AcceptLanguage = core.StringPtr("testString") - getMachineTypeOptionsModel.IfNoneMatch = core.StringPtr("testString") getMachineTypeOptionsModel.StandbyWorkspaceName = core.StringPtr("Test-workspace-wdc07") getMachineTypeOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} @@ -2058,10 +1975,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetMachineTypeOptions model getMachineTypeOptionsModel := new(drautomationservicev1.GetMachineTypeOptions) - getMachineTypeOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getMachineTypeOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getMachineTypeOptionsModel.PrimaryWorkspaceName = core.StringPtr("Test-workspace-wdc06") getMachineTypeOptionsModel.AcceptLanguage = core.StringPtr("testString") - getMachineTypeOptionsModel.IfNoneMatch = core.StringPtr("testString") getMachineTypeOptionsModel.StandbyWorkspaceName = core.StringPtr("Test-workspace-wdc07") getMachineTypeOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) @@ -2103,10 +2019,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetMachineTypeOptions model getMachineTypeOptionsModel := new(drautomationservicev1.GetMachineTypeOptions) - getMachineTypeOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getMachineTypeOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getMachineTypeOptionsModel.PrimaryWorkspaceName = core.StringPtr("Test-workspace-wdc06") getMachineTypeOptionsModel.AcceptLanguage = core.StringPtr("testString") - getMachineTypeOptionsModel.IfNoneMatch = core.StringPtr("testString") getMachineTypeOptionsModel.StandbyWorkspaceName = core.StringPtr("Test-workspace-wdc07") getMachineTypeOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} @@ -2124,7 +2039,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetPowervsWorkspaces(getPowervsWorkspacesOptions *GetPowervsWorkspacesOptions) - Operation response error`, func() { - getPowervsWorkspacesPath := "/drautomation/v1/powervs_workspaces/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getPowervsWorkspacesPath := "/drautomation/v1/powervs_workspaces/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -2133,8 +2048,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Verify the contents of the request Expect(req.URL.EscapedPath()).To(Equal(getPowervsWorkspacesPath)) Expect(req.Method).To(Equal("GET")) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["location_id"]).To(Equal([]string{"testString"})) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -2151,9 +2064,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetPowervsWorkspacesOptions model getPowervsWorkspacesOptionsModel := new(drautomationservicev1.GetPowervsWorkspacesOptions) - getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getPowervsWorkspacesOptionsModel.LocationID = core.StringPtr("testString") - getPowervsWorkspacesOptionsModel.IfNoneMatch = core.StringPtr("testString") getPowervsWorkspacesOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetPowervsWorkspaces(getPowervsWorkspacesOptionsModel) @@ -2174,7 +2086,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetPowervsWorkspaces(getPowervsWorkspacesOptions *GetPowervsWorkspacesOptions)`, func() { - getPowervsWorkspacesPath := "/drautomation/v1/powervs_workspaces/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getPowervsWorkspacesPath := "/drautomation/v1/powervs_workspaces/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -2184,8 +2096,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.URL.EscapedPath()).To(Equal(getPowervsWorkspacesPath)) Expect(req.Method).To(Equal("GET")) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["location_id"]).To(Equal([]string{"testString"})) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -2207,9 +2117,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetPowervsWorkspacesOptions model getPowervsWorkspacesOptionsModel := new(drautomationservicev1.GetPowervsWorkspacesOptions) - getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getPowervsWorkspacesOptionsModel.LocationID = core.StringPtr("testString") - getPowervsWorkspacesOptionsModel.IfNoneMatch = core.StringPtr("testString") getPowervsWorkspacesOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -2246,8 +2155,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.URL.EscapedPath()).To(Equal(getPowervsWorkspacesPath)) Expect(req.Method).To(Equal("GET")) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["location_id"]).To(Equal([]string{"testString"})) // Set mock response res.Header().Set("Content-type", "application/json") @@ -2271,9 +2178,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetPowervsWorkspacesOptions model getPowervsWorkspacesOptionsModel := new(drautomationservicev1.GetPowervsWorkspacesOptions) - getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getPowervsWorkspacesOptionsModel.LocationID = core.StringPtr("testString") - getPowervsWorkspacesOptionsModel.IfNoneMatch = core.StringPtr("testString") getPowervsWorkspacesOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -2293,9 +2199,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetPowervsWorkspacesOptions model getPowervsWorkspacesOptionsModel := new(drautomationservicev1.GetPowervsWorkspacesOptions) - getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getPowervsWorkspacesOptionsModel.LocationID = core.StringPtr("testString") - getPowervsWorkspacesOptionsModel.IfNoneMatch = core.StringPtr("testString") getPowervsWorkspacesOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -2336,9 +2241,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetPowervsWorkspacesOptions model getPowervsWorkspacesOptionsModel := new(drautomationservicev1.GetPowervsWorkspacesOptions) - getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getPowervsWorkspacesOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getPowervsWorkspacesOptionsModel.LocationID = core.StringPtr("testString") - getPowervsWorkspacesOptionsModel.IfNoneMatch = core.StringPtr("testString") getPowervsWorkspacesOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -2355,7 +2259,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetManageDr(getManageDrOptions *GetManageDrOptions) - Operation response error`, func() { - getManageDrPath := "/drautomation/v1/manage_dr/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getManageDrPath := "/drautomation/v1/manage_dr/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -2366,8 +2270,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -2383,9 +2285,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetManageDrOptions model getManageDrOptionsModel := new(drautomationservicev1.GetManageDrOptions) - getManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - getManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") getManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetManageDr(getManageDrOptionsModel) @@ -2406,7 +2307,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetManageDr(getManageDrOptions *GetManageDrOptions)`, func() { - getManageDrPath := "/drautomation/v1/manage_dr/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getManageDrPath := "/drautomation/v1/manage_dr/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -2418,8 +2319,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -2440,9 +2339,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetManageDrOptions model getManageDrOptionsModel := new(drautomationservicev1.GetManageDrOptions) - getManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - getManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") getManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -2481,8 +2379,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -2505,9 +2401,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetManageDrOptions model getManageDrOptionsModel := new(drautomationservicev1.GetManageDrOptions) - getManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - getManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") getManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -2527,9 +2422,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetManageDrOptions model getManageDrOptionsModel := new(drautomationservicev1.GetManageDrOptions) - getManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - getManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") getManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -2570,9 +2464,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetManageDrOptions model getManageDrOptionsModel := new(drautomationservicev1.GetManageDrOptions) - getManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - getManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") getManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -2589,7 +2482,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`CreateManageDr(createManageDrOptions *CreateManageDrOptions) - Operation response error`, func() { - createManageDrPath := "/drautomation/v1/manage_dr/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + createManageDrPath := "/drautomation/v1/manage_dr/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -2600,8 +2493,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("POST")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["stand_by_redeploy"]).To(Equal([]string{"testString"})) // TODO: Add check for accepts_incomplete query parameter res.Header().Set("Content-type", "application/json") @@ -2619,36 +2510,32 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateManageDrOptions model createManageDrOptionsModel := new(drautomationservicev1.CreateManageDrOptions) - createManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") - createManageDrOptionsModel.APIKey = core.StringPtr("testString") - createManageDrOptionsModel.ClientID = core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122") - createManageDrOptionsModel.ClientSecret = core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC") - createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createManageDrOptionsModel.LocationID = core.StringPtr("dal10") createManageDrOptionsModel.MachineType = core.StringPtr("bx2-4x16") - createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.OrchestratorLocationType = core.StringPtr("off-premises") createManageDrOptionsModel.OrchestratorName = core.StringPtr("adminUser") createManageDrOptionsModel.OrchestratorPassword = core.StringPtr("testString") createManageDrOptionsModel.OrchestratorWorkspaceID = core.StringPtr("orch-workspace-01") - createManageDrOptionsModel.OrchestratorWorkspaceLocation = core.StringPtr("us-south") + createManageDrOptionsModel.APIKey = core.StringPtr("testString") + createManageDrOptionsModel.ClientID = core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234") + createManageDrOptionsModel.ClientSecret = core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh") + createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.ProxyIP = core.StringPtr("10.40.30.10:8888") createManageDrOptionsModel.RegionID = core.StringPtr("us-south") createManageDrOptionsModel.ResourceInstance = core.StringPtr("crn:v1:bluemix:public:resource-controller::res123") - createManageDrOptionsModel.SecondaryWorkspaceID = core.StringPtr("secondary-workspace789") createManageDrOptionsModel.Secret = core.StringPtr("testString") createManageDrOptionsModel.SecretGroup = core.StringPtr("default-secret-group") createManageDrOptionsModel.SSHKeyName = core.StringPtr("my-ssh-key") createManageDrOptionsModel.StandbyMachineType = core.StringPtr("bx2-8x32") createManageDrOptionsModel.StandbyOrchestratorName = core.StringPtr("standbyAdmin") createManageDrOptionsModel.StandbyOrchestratorWorkspaceID = core.StringPtr("orch-standby-02") - createManageDrOptionsModel.StandbyOrchestratorWorkspaceLocation = core.StringPtr("us-east") createManageDrOptionsModel.StandbyTier = core.StringPtr("Premium") createManageDrOptionsModel.TenantName = core.StringPtr("xxx.ibm.com") createManageDrOptionsModel.Tier = core.StringPtr("Standard") createManageDrOptionsModel.StandByRedeploy = core.StringPtr("testString") createManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - createManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") createManageDrOptionsModel.AcceptsIncomplete = core.BoolPtr(true) createManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response @@ -2670,7 +2557,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`CreateManageDr(createManageDrOptions *CreateManageDrOptions)`, func() { - createManageDrPath := "/drautomation/v1/manage_dr/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + createManageDrPath := "/drautomation/v1/manage_dr/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -2698,8 +2585,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["stand_by_redeploy"]).To(Equal([]string{"testString"})) // TODO: Add check for accepts_incomplete query parameter // Sleep a short time to support a timeout test @@ -2722,36 +2607,32 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateManageDrOptions model createManageDrOptionsModel := new(drautomationservicev1.CreateManageDrOptions) - createManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") - createManageDrOptionsModel.APIKey = core.StringPtr("testString") - createManageDrOptionsModel.ClientID = core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122") - createManageDrOptionsModel.ClientSecret = core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC") - createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createManageDrOptionsModel.LocationID = core.StringPtr("dal10") createManageDrOptionsModel.MachineType = core.StringPtr("bx2-4x16") - createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.OrchestratorLocationType = core.StringPtr("off-premises") createManageDrOptionsModel.OrchestratorName = core.StringPtr("adminUser") createManageDrOptionsModel.OrchestratorPassword = core.StringPtr("testString") createManageDrOptionsModel.OrchestratorWorkspaceID = core.StringPtr("orch-workspace-01") - createManageDrOptionsModel.OrchestratorWorkspaceLocation = core.StringPtr("us-south") + createManageDrOptionsModel.APIKey = core.StringPtr("testString") + createManageDrOptionsModel.ClientID = core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234") + createManageDrOptionsModel.ClientSecret = core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh") + createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.ProxyIP = core.StringPtr("10.40.30.10:8888") createManageDrOptionsModel.RegionID = core.StringPtr("us-south") createManageDrOptionsModel.ResourceInstance = core.StringPtr("crn:v1:bluemix:public:resource-controller::res123") - createManageDrOptionsModel.SecondaryWorkspaceID = core.StringPtr("secondary-workspace789") createManageDrOptionsModel.Secret = core.StringPtr("testString") createManageDrOptionsModel.SecretGroup = core.StringPtr("default-secret-group") createManageDrOptionsModel.SSHKeyName = core.StringPtr("my-ssh-key") createManageDrOptionsModel.StandbyMachineType = core.StringPtr("bx2-8x32") createManageDrOptionsModel.StandbyOrchestratorName = core.StringPtr("standbyAdmin") createManageDrOptionsModel.StandbyOrchestratorWorkspaceID = core.StringPtr("orch-standby-02") - createManageDrOptionsModel.StandbyOrchestratorWorkspaceLocation = core.StringPtr("us-east") createManageDrOptionsModel.StandbyTier = core.StringPtr("Premium") createManageDrOptionsModel.TenantName = core.StringPtr("xxx.ibm.com") createManageDrOptionsModel.Tier = core.StringPtr("Standard") createManageDrOptionsModel.StandByRedeploy = core.StringPtr("testString") createManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - createManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") createManageDrOptionsModel.AcceptsIncomplete = core.BoolPtr(true) createManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} @@ -2807,8 +2688,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["stand_by_redeploy"]).To(Equal([]string{"testString"})) // TODO: Add check for accepts_incomplete query parameter // Set mock response @@ -2833,36 +2712,32 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateManageDrOptions model createManageDrOptionsModel := new(drautomationservicev1.CreateManageDrOptions) - createManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") - createManageDrOptionsModel.APIKey = core.StringPtr("testString") - createManageDrOptionsModel.ClientID = core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122") - createManageDrOptionsModel.ClientSecret = core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC") - createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createManageDrOptionsModel.LocationID = core.StringPtr("dal10") createManageDrOptionsModel.MachineType = core.StringPtr("bx2-4x16") - createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.OrchestratorLocationType = core.StringPtr("off-premises") createManageDrOptionsModel.OrchestratorName = core.StringPtr("adminUser") createManageDrOptionsModel.OrchestratorPassword = core.StringPtr("testString") createManageDrOptionsModel.OrchestratorWorkspaceID = core.StringPtr("orch-workspace-01") - createManageDrOptionsModel.OrchestratorWorkspaceLocation = core.StringPtr("us-south") + createManageDrOptionsModel.APIKey = core.StringPtr("testString") + createManageDrOptionsModel.ClientID = core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234") + createManageDrOptionsModel.ClientSecret = core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh") + createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.ProxyIP = core.StringPtr("10.40.30.10:8888") createManageDrOptionsModel.RegionID = core.StringPtr("us-south") createManageDrOptionsModel.ResourceInstance = core.StringPtr("crn:v1:bluemix:public:resource-controller::res123") - createManageDrOptionsModel.SecondaryWorkspaceID = core.StringPtr("secondary-workspace789") createManageDrOptionsModel.Secret = core.StringPtr("testString") createManageDrOptionsModel.SecretGroup = core.StringPtr("default-secret-group") createManageDrOptionsModel.SSHKeyName = core.StringPtr("my-ssh-key") createManageDrOptionsModel.StandbyMachineType = core.StringPtr("bx2-8x32") createManageDrOptionsModel.StandbyOrchestratorName = core.StringPtr("standbyAdmin") createManageDrOptionsModel.StandbyOrchestratorWorkspaceID = core.StringPtr("orch-standby-02") - createManageDrOptionsModel.StandbyOrchestratorWorkspaceLocation = core.StringPtr("us-east") createManageDrOptionsModel.StandbyTier = core.StringPtr("Premium") createManageDrOptionsModel.TenantName = core.StringPtr("xxx.ibm.com") createManageDrOptionsModel.Tier = core.StringPtr("Standard") createManageDrOptionsModel.StandByRedeploy = core.StringPtr("testString") createManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - createManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") createManageDrOptionsModel.AcceptsIncomplete = core.BoolPtr(true) createManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} @@ -2883,36 +2758,32 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateManageDrOptions model createManageDrOptionsModel := new(drautomationservicev1.CreateManageDrOptions) - createManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") - createManageDrOptionsModel.APIKey = core.StringPtr("testString") - createManageDrOptionsModel.ClientID = core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122") - createManageDrOptionsModel.ClientSecret = core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC") - createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createManageDrOptionsModel.LocationID = core.StringPtr("dal10") createManageDrOptionsModel.MachineType = core.StringPtr("bx2-4x16") - createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.OrchestratorLocationType = core.StringPtr("off-premises") createManageDrOptionsModel.OrchestratorName = core.StringPtr("adminUser") createManageDrOptionsModel.OrchestratorPassword = core.StringPtr("testString") createManageDrOptionsModel.OrchestratorWorkspaceID = core.StringPtr("orch-workspace-01") - createManageDrOptionsModel.OrchestratorWorkspaceLocation = core.StringPtr("us-south") + createManageDrOptionsModel.APIKey = core.StringPtr("testString") + createManageDrOptionsModel.ClientID = core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234") + createManageDrOptionsModel.ClientSecret = core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh") + createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.ProxyIP = core.StringPtr("10.40.30.10:8888") createManageDrOptionsModel.RegionID = core.StringPtr("us-south") createManageDrOptionsModel.ResourceInstance = core.StringPtr("crn:v1:bluemix:public:resource-controller::res123") - createManageDrOptionsModel.SecondaryWorkspaceID = core.StringPtr("secondary-workspace789") createManageDrOptionsModel.Secret = core.StringPtr("testString") createManageDrOptionsModel.SecretGroup = core.StringPtr("default-secret-group") createManageDrOptionsModel.SSHKeyName = core.StringPtr("my-ssh-key") createManageDrOptionsModel.StandbyMachineType = core.StringPtr("bx2-8x32") createManageDrOptionsModel.StandbyOrchestratorName = core.StringPtr("standbyAdmin") createManageDrOptionsModel.StandbyOrchestratorWorkspaceID = core.StringPtr("orch-standby-02") - createManageDrOptionsModel.StandbyOrchestratorWorkspaceLocation = core.StringPtr("us-east") createManageDrOptionsModel.StandbyTier = core.StringPtr("Premium") createManageDrOptionsModel.TenantName = core.StringPtr("xxx.ibm.com") createManageDrOptionsModel.Tier = core.StringPtr("Standard") createManageDrOptionsModel.StandByRedeploy = core.StringPtr("testString") createManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - createManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") createManageDrOptionsModel.AcceptsIncomplete = core.BoolPtr(true) createManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) @@ -2954,36 +2825,32 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the CreateManageDrOptions model createManageDrOptionsModel := new(drautomationservicev1.CreateManageDrOptions) - createManageDrOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") - createManageDrOptionsModel.APIKey = core.StringPtr("testString") - createManageDrOptionsModel.ClientID = core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122") - createManageDrOptionsModel.ClientSecret = core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC") - createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") createManageDrOptionsModel.LocationID = core.StringPtr("dal10") createManageDrOptionsModel.MachineType = core.StringPtr("bx2-4x16") - createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.OrchestratorLocationType = core.StringPtr("off-premises") createManageDrOptionsModel.OrchestratorName = core.StringPtr("adminUser") createManageDrOptionsModel.OrchestratorPassword = core.StringPtr("testString") createManageDrOptionsModel.OrchestratorWorkspaceID = core.StringPtr("orch-workspace-01") - createManageDrOptionsModel.OrchestratorWorkspaceLocation = core.StringPtr("us-south") + createManageDrOptionsModel.APIKey = core.StringPtr("testString") + createManageDrOptionsModel.ClientID = core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234") + createManageDrOptionsModel.ClientSecret = core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh") + createManageDrOptionsModel.GUID = core.StringPtr("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.OrchestratorHa = core.BoolPtr(true) createManageDrOptionsModel.ProxyIP = core.StringPtr("10.40.30.10:8888") createManageDrOptionsModel.RegionID = core.StringPtr("us-south") createManageDrOptionsModel.ResourceInstance = core.StringPtr("crn:v1:bluemix:public:resource-controller::res123") - createManageDrOptionsModel.SecondaryWorkspaceID = core.StringPtr("secondary-workspace789") createManageDrOptionsModel.Secret = core.StringPtr("testString") createManageDrOptionsModel.SecretGroup = core.StringPtr("default-secret-group") createManageDrOptionsModel.SSHKeyName = core.StringPtr("my-ssh-key") createManageDrOptionsModel.StandbyMachineType = core.StringPtr("bx2-8x32") createManageDrOptionsModel.StandbyOrchestratorName = core.StringPtr("standbyAdmin") createManageDrOptionsModel.StandbyOrchestratorWorkspaceID = core.StringPtr("orch-standby-02") - createManageDrOptionsModel.StandbyOrchestratorWorkspaceLocation = core.StringPtr("us-east") createManageDrOptionsModel.StandbyTier = core.StringPtr("Premium") createManageDrOptionsModel.TenantName = core.StringPtr("xxx.ibm.com") createManageDrOptionsModel.Tier = core.StringPtr("Standard") createManageDrOptionsModel.StandByRedeploy = core.StringPtr("testString") createManageDrOptionsModel.AcceptLanguage = core.StringPtr("testString") - createManageDrOptionsModel.IfNoneMatch = core.StringPtr("testString") createManageDrOptionsModel.AcceptsIncomplete = core.BoolPtr(true) createManageDrOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} @@ -3001,7 +2868,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetLastOperation(getLastOperationOptions *GetLastOperationOptions) - Operation response error`, func() { - getLastOperationPath := "/drautomation/v1/last_operation/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getLastOperationPath := "/drautomation/v1/last_operation/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -3012,8 +2879,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -3029,9 +2894,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetLastOperationOptions model getLastOperationOptionsModel := new(drautomationservicev1.GetLastOperationOptions) - getLastOperationOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getLastOperationOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getLastOperationOptionsModel.AcceptLanguage = core.StringPtr("testString") - getLastOperationOptionsModel.IfNoneMatch = core.StringPtr("testString") getLastOperationOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetLastOperation(getLastOperationOptionsModel) @@ -3052,7 +2916,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetLastOperation(getLastOperationOptions *GetLastOperationOptions)`, func() { - getLastOperationPath := "/drautomation/v1/last_operation/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + getLastOperationPath := "/drautomation/v1/last_operation/123456d3-1122-3344-b67d-4389b44b7bf9" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -3064,8 +2928,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -3086,9 +2948,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetLastOperationOptions model getLastOperationOptionsModel := new(drautomationservicev1.GetLastOperationOptions) - getLastOperationOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getLastOperationOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getLastOperationOptionsModel.AcceptLanguage = core.StringPtr("testString") - getLastOperationOptionsModel.IfNoneMatch = core.StringPtr("testString") getLastOperationOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -3127,8 +2988,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -3151,9 +3010,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetLastOperationOptions model getLastOperationOptionsModel := new(drautomationservicev1.GetLastOperationOptions) - getLastOperationOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getLastOperationOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getLastOperationOptionsModel.AcceptLanguage = core.StringPtr("testString") - getLastOperationOptionsModel.IfNoneMatch = core.StringPtr("testString") getLastOperationOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -3173,9 +3031,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetLastOperationOptions model getLastOperationOptionsModel := new(drautomationservicev1.GetLastOperationOptions) - getLastOperationOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getLastOperationOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getLastOperationOptionsModel.AcceptLanguage = core.StringPtr("testString") - getLastOperationOptionsModel.IfNoneMatch = core.StringPtr("testString") getLastOperationOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -3216,9 +3073,8 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetLastOperationOptions model getLastOperationOptionsModel := new(drautomationservicev1.GetLastOperationOptions) - getLastOperationOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getLastOperationOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getLastOperationOptionsModel.AcceptLanguage = core.StringPtr("testString") - getLastOperationOptionsModel.IfNoneMatch = core.StringPtr("testString") getLastOperationOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -3235,7 +3091,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`ListEvents(listEventsOptions *ListEventsOptions) - Operation response error`, func() { - listEventsPath := "/drautomation/v1/service_instances/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::/events" + listEventsPath := "/drautomation/v1/service_instances/123456d3-1122-3344-b67d-4389b44b7bf9/events" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -3246,8 +3102,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["time"]).To(Equal([]string{"2025-06-19T23:59:59Z"})) Expect(req.URL.Query()["from_time"]).To(Equal([]string{"2025-06-19T00:00:00Z"})) Expect(req.URL.Query()["to_time"]).To(Equal([]string{"2025-06-19T23:59:59Z"})) @@ -3266,12 +3120,11 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the ListEventsOptions model listEventsOptionsModel := new(drautomationservicev1.ListEventsOptions) - listEventsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + listEventsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") listEventsOptionsModel.Time = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.FromTime = core.StringPtr("2025-06-19T00:00:00Z") listEventsOptionsModel.ToTime = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.AcceptLanguage = core.StringPtr("testString") - listEventsOptionsModel.IfNoneMatch = core.StringPtr("testString") listEventsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.ListEvents(listEventsOptionsModel) @@ -3292,7 +3145,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`ListEvents(listEventsOptions *ListEventsOptions)`, func() { - listEventsPath := "/drautomation/v1/service_instances/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::/events" + listEventsPath := "/drautomation/v1/service_instances/123456d3-1122-3344-b67d-4389b44b7bf9/events" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -3304,8 +3157,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["time"]).To(Equal([]string{"2025-06-19T23:59:59Z"})) Expect(req.URL.Query()["from_time"]).To(Equal([]string{"2025-06-19T00:00:00Z"})) Expect(req.URL.Query()["to_time"]).To(Equal([]string{"2025-06-19T23:59:59Z"})) @@ -3329,12 +3180,11 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the ListEventsOptions model listEventsOptionsModel := new(drautomationservicev1.ListEventsOptions) - listEventsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + listEventsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") listEventsOptionsModel.Time = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.FromTime = core.StringPtr("2025-06-19T00:00:00Z") listEventsOptionsModel.ToTime = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.AcceptLanguage = core.StringPtr("testString") - listEventsOptionsModel.IfNoneMatch = core.StringPtr("testString") listEventsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -3373,8 +3223,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) Expect(req.URL.Query()["time"]).To(Equal([]string{"2025-06-19T23:59:59Z"})) Expect(req.URL.Query()["from_time"]).To(Equal([]string{"2025-06-19T00:00:00Z"})) Expect(req.URL.Query()["to_time"]).To(Equal([]string{"2025-06-19T23:59:59Z"})) @@ -3400,12 +3248,11 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the ListEventsOptions model listEventsOptionsModel := new(drautomationservicev1.ListEventsOptions) - listEventsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + listEventsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") listEventsOptionsModel.Time = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.FromTime = core.StringPtr("2025-06-19T00:00:00Z") listEventsOptionsModel.ToTime = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.AcceptLanguage = core.StringPtr("testString") - listEventsOptionsModel.IfNoneMatch = core.StringPtr("testString") listEventsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -3425,12 +3272,11 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the ListEventsOptions model listEventsOptionsModel := new(drautomationservicev1.ListEventsOptions) - listEventsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + listEventsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") listEventsOptionsModel.Time = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.FromTime = core.StringPtr("2025-06-19T00:00:00Z") listEventsOptionsModel.ToTime = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.AcceptLanguage = core.StringPtr("testString") - listEventsOptionsModel.IfNoneMatch = core.StringPtr("testString") listEventsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -3471,12 +3317,11 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the ListEventsOptions model listEventsOptionsModel := new(drautomationservicev1.ListEventsOptions) - listEventsOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + listEventsOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") listEventsOptionsModel.Time = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.FromTime = core.StringPtr("2025-06-19T00:00:00Z") listEventsOptionsModel.ToTime = core.StringPtr("2025-06-19T23:59:59Z") listEventsOptionsModel.AcceptLanguage = core.StringPtr("testString") - listEventsOptionsModel.IfNoneMatch = core.StringPtr("testString") listEventsOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -3493,7 +3338,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetEvent(getEventOptions *GetEventOptions) - Operation response error`, func() { - getEventPath := "/drautomation/v1/service_instances/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::/events/00116b2a-9326-4024-839e-fb5364b76898" + getEventPath := "/drautomation/v1/service_instances/123456d3-1122-3344-b67d-4389b44b7bf9/events/00116b2a-9326-4024-839e-fb5364b76898" Context(`Using mock server endpoint with invalid JSON response`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -3504,8 +3349,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Method).To(Equal("GET")) Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) res.Header().Set("Content-type", "application/json") res.WriteHeader(200) fmt.Fprint(res, `} this is not valid json {`) @@ -3521,10 +3364,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetEventOptions model getEventOptionsModel := new(drautomationservicev1.GetEventOptions) - getEventOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getEventOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getEventOptionsModel.EventID = core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898") getEventOptionsModel.AcceptLanguage = core.StringPtr("testString") - getEventOptionsModel.IfNoneMatch = core.StringPtr("testString") getEventOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Expect response parsing to fail since we are receiving a text/plain response result, response, operationErr := drAutomationServiceService.GetEvent(getEventOptionsModel) @@ -3545,7 +3387,7 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) }) Describe(`GetEvent(getEventOptions *GetEventOptions)`, func() { - getEventPath := "/drautomation/v1/service_instances/crn:v1:staging:public:power-dr-automation:global:a%2Fa123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::/events/00116b2a-9326-4024-839e-fb5364b76898" + getEventPath := "/drautomation/v1/service_instances/123456d3-1122-3344-b67d-4389b44b7bf9/events/00116b2a-9326-4024-839e-fb5364b76898" Context(`Using mock server endpoint with timeout`, func() { BeforeEach(func() { testServer = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { @@ -3557,8 +3399,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Sleep a short time to support a timeout test time.Sleep(100 * time.Millisecond) @@ -3579,10 +3419,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetEventOptions model getEventOptionsModel := new(drautomationservicev1.GetEventOptions) - getEventOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getEventOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getEventOptionsModel.EventID = core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898") getEventOptionsModel.AcceptLanguage = core.StringPtr("testString") - getEventOptionsModel.IfNoneMatch = core.StringPtr("testString") getEventOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with a Context to test a timeout error @@ -3621,8 +3460,6 @@ var _ = Describe(`DrAutomationServiceV1`, func() { Expect(req.Header["Accept-Language"]).ToNot(BeNil()) Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) - Expect(req.Header["If-None-Match"]).ToNot(BeNil()) - Expect(req.Header["If-None-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString"))) // Set mock response res.Header().Set("Content-type", "application/json") res.WriteHeader(200) @@ -3645,10 +3482,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetEventOptions model getEventOptionsModel := new(drautomationservicev1.GetEventOptions) - getEventOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getEventOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getEventOptionsModel.EventID = core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898") getEventOptionsModel.AcceptLanguage = core.StringPtr("testString") - getEventOptionsModel.IfNoneMatch = core.StringPtr("testString") getEventOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with valid options model (positive test) @@ -3668,10 +3504,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetEventOptions model getEventOptionsModel := new(drautomationservicev1.GetEventOptions) - getEventOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getEventOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getEventOptionsModel.EventID = core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898") getEventOptionsModel.AcceptLanguage = core.StringPtr("testString") - getEventOptionsModel.IfNoneMatch = core.StringPtr("testString") getEventOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation with empty URL (negative test) err := drAutomationServiceService.SetServiceURL("") @@ -3712,10 +3547,9 @@ var _ = Describe(`DrAutomationServiceV1`, func() { // Construct an instance of the GetEventOptions model getEventOptionsModel := new(drautomationservicev1.GetEventOptions) - getEventOptionsModel.InstanceID = core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getEventOptionsModel.InstanceID = core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9") getEventOptionsModel.EventID = core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898") getEventOptionsModel.AcceptLanguage = core.StringPtr("testString") - getEventOptionsModel.IfNoneMatch = core.StringPtr("testString") getEventOptionsModel.Headers = map[string]string{"x-custom-header": "x-custom-value"} // Invoke operation @@ -3739,275 +3573,247 @@ var _ = Describe(`DrAutomationServiceV1`, func() { }) It(`Invoke NewCreateApikeyOptions successfully`, func() { // Construct an instance of the CreateApikeyOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" createApikeyOptionsAPIKey := "abcdefrg_izklmnop_fxbEED" createApikeyOptionsModel := drAutomationServiceService.NewCreateApikeyOptions(instanceID, createApikeyOptionsAPIKey) - createApikeyOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + createApikeyOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") createApikeyOptionsModel.SetAPIKey("abcdefrg_izklmnop_fxbEED") createApikeyOptionsModel.SetAcceptLanguage("testString") - createApikeyOptionsModel.SetIfNoneMatch("testString") createApikeyOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(createApikeyOptionsModel).ToNot(BeNil()) - Expect(createApikeyOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(createApikeyOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(createApikeyOptionsModel.APIKey).To(Equal(core.StringPtr("abcdefrg_izklmnop_fxbEED"))) Expect(createApikeyOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(createApikeyOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(createApikeyOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewCreateManageDrOptions successfully`, func() { // Construct an instance of the CreateManageDrOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" - createManageDrOptionsModel := drAutomationServiceService.NewCreateManageDrOptions(instanceID) - createManageDrOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") - createManageDrOptionsModel.SetAPIKey("testString") - createManageDrOptionsModel.SetClientID("d9f2c83a-97d2-4b14-bf62-8eaecc67a122") - createManageDrOptionsModel.SetClientSecret("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC") - createManageDrOptionsModel.SetGUID("123e4567-e89b-12d3-a456-426614174000") + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" + createManageDrOptionsLocationID := "dal10" + createManageDrOptionsMachineType := "bx2-4x16" + createManageDrOptionsOrchestratorLocationType := "off-premises" + createManageDrOptionsOrchestratorName := "adminUser" + createManageDrOptionsOrchestratorPassword := "testString" + createManageDrOptionsOrchestratorWorkspaceID := "orch-workspace-01" + createManageDrOptionsModel := drAutomationServiceService.NewCreateManageDrOptions(instanceID, createManageDrOptionsLocationID, createManageDrOptionsMachineType, createManageDrOptionsOrchestratorLocationType, createManageDrOptionsOrchestratorName, createManageDrOptionsOrchestratorPassword, createManageDrOptionsOrchestratorWorkspaceID) + createManageDrOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") createManageDrOptionsModel.SetLocationID("dal10") createManageDrOptionsModel.SetMachineType("bx2-4x16") - createManageDrOptionsModel.SetOrchestratorHa(true) createManageDrOptionsModel.SetOrchestratorLocationType("off-premises") createManageDrOptionsModel.SetOrchestratorName("adminUser") createManageDrOptionsModel.SetOrchestratorPassword("testString") createManageDrOptionsModel.SetOrchestratorWorkspaceID("orch-workspace-01") - createManageDrOptionsModel.SetOrchestratorWorkspaceLocation("us-south") + createManageDrOptionsModel.SetAPIKey("testString") + createManageDrOptionsModel.SetClientID("abcd-97d2-1234-bf62-8eaecc67a1234") + createManageDrOptionsModel.SetClientSecret("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh") + createManageDrOptionsModel.SetGUID("123e4567-e89b-12d3-a456-426614174000") + createManageDrOptionsModel.SetOrchestratorHa(true) createManageDrOptionsModel.SetProxyIP("10.40.30.10:8888") createManageDrOptionsModel.SetRegionID("us-south") createManageDrOptionsModel.SetResourceInstance("crn:v1:bluemix:public:resource-controller::res123") - createManageDrOptionsModel.SetSecondaryWorkspaceID("secondary-workspace789") createManageDrOptionsModel.SetSecret("testString") createManageDrOptionsModel.SetSecretGroup("default-secret-group") createManageDrOptionsModel.SetSSHKeyName("my-ssh-key") createManageDrOptionsModel.SetStandbyMachineType("bx2-8x32") createManageDrOptionsModel.SetStandbyOrchestratorName("standbyAdmin") createManageDrOptionsModel.SetStandbyOrchestratorWorkspaceID("orch-standby-02") - createManageDrOptionsModel.SetStandbyOrchestratorWorkspaceLocation("us-east") createManageDrOptionsModel.SetStandbyTier("Premium") createManageDrOptionsModel.SetTenantName("xxx.ibm.com") createManageDrOptionsModel.SetTier("Standard") createManageDrOptionsModel.SetStandByRedeploy("testString") createManageDrOptionsModel.SetAcceptLanguage("testString") - createManageDrOptionsModel.SetIfNoneMatch("testString") createManageDrOptionsModel.SetAcceptsIncomplete(true) createManageDrOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(createManageDrOptionsModel).ToNot(BeNil()) - Expect(createManageDrOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) - Expect(createManageDrOptionsModel.APIKey).To(Equal(core.StringPtr("testString"))) - Expect(createManageDrOptionsModel.ClientID).To(Equal(core.StringPtr("d9f2c83a-97d2-4b14-bf62-8eaecc67a122"))) - Expect(createManageDrOptionsModel.ClientSecret).To(Equal(core.StringPtr("N8lQ4tP2xM1yT5rS8wK6qR9dD7vF1hU4sA3bE2jG0pL9oX7yC"))) - Expect(createManageDrOptionsModel.GUID).To(Equal(core.StringPtr("123e4567-e89b-12d3-a456-426614174000"))) + Expect(createManageDrOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(createManageDrOptionsModel.LocationID).To(Equal(core.StringPtr("dal10"))) Expect(createManageDrOptionsModel.MachineType).To(Equal(core.StringPtr("bx2-4x16"))) - Expect(createManageDrOptionsModel.OrchestratorHa).To(Equal(core.BoolPtr(true))) Expect(createManageDrOptionsModel.OrchestratorLocationType).To(Equal(core.StringPtr("off-premises"))) Expect(createManageDrOptionsModel.OrchestratorName).To(Equal(core.StringPtr("adminUser"))) Expect(createManageDrOptionsModel.OrchestratorPassword).To(Equal(core.StringPtr("testString"))) Expect(createManageDrOptionsModel.OrchestratorWorkspaceID).To(Equal(core.StringPtr("orch-workspace-01"))) - Expect(createManageDrOptionsModel.OrchestratorWorkspaceLocation).To(Equal(core.StringPtr("us-south"))) + Expect(createManageDrOptionsModel.APIKey).To(Equal(core.StringPtr("testString"))) + Expect(createManageDrOptionsModel.ClientID).To(Equal(core.StringPtr("abcd-97d2-1234-bf62-8eaecc67a1234"))) + Expect(createManageDrOptionsModel.ClientSecret).To(Equal(core.StringPtr("abcd1234xM1y123wK6qR9123456789bE2jG0pabcdefgh"))) + Expect(createManageDrOptionsModel.GUID).To(Equal(core.StringPtr("123e4567-e89b-12d3-a456-426614174000"))) + Expect(createManageDrOptionsModel.OrchestratorHa).To(Equal(core.BoolPtr(true))) Expect(createManageDrOptionsModel.ProxyIP).To(Equal(core.StringPtr("10.40.30.10:8888"))) Expect(createManageDrOptionsModel.RegionID).To(Equal(core.StringPtr("us-south"))) Expect(createManageDrOptionsModel.ResourceInstance).To(Equal(core.StringPtr("crn:v1:bluemix:public:resource-controller::res123"))) - Expect(createManageDrOptionsModel.SecondaryWorkspaceID).To(Equal(core.StringPtr("secondary-workspace789"))) Expect(createManageDrOptionsModel.Secret).To(Equal(core.StringPtr("testString"))) Expect(createManageDrOptionsModel.SecretGroup).To(Equal(core.StringPtr("default-secret-group"))) Expect(createManageDrOptionsModel.SSHKeyName).To(Equal(core.StringPtr("my-ssh-key"))) Expect(createManageDrOptionsModel.StandbyMachineType).To(Equal(core.StringPtr("bx2-8x32"))) Expect(createManageDrOptionsModel.StandbyOrchestratorName).To(Equal(core.StringPtr("standbyAdmin"))) Expect(createManageDrOptionsModel.StandbyOrchestratorWorkspaceID).To(Equal(core.StringPtr("orch-standby-02"))) - Expect(createManageDrOptionsModel.StandbyOrchestratorWorkspaceLocation).To(Equal(core.StringPtr("us-east"))) Expect(createManageDrOptionsModel.StandbyTier).To(Equal(core.StringPtr("Premium"))) Expect(createManageDrOptionsModel.TenantName).To(Equal(core.StringPtr("xxx.ibm.com"))) Expect(createManageDrOptionsModel.Tier).To(Equal(core.StringPtr("Standard"))) Expect(createManageDrOptionsModel.StandByRedeploy).To(Equal(core.StringPtr("testString"))) Expect(createManageDrOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(createManageDrOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(createManageDrOptionsModel.AcceptsIncomplete).To(Equal(core.BoolPtr(true))) Expect(createManageDrOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetApikeyOptions successfully`, func() { // Construct an instance of the GetApikeyOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getApikeyOptionsModel := drAutomationServiceService.NewGetApikeyOptions(instanceID) - getApikeyOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getApikeyOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getApikeyOptionsModel.SetAcceptLanguage("testString") - getApikeyOptionsModel.SetIfNoneMatch("testString") getApikeyOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getApikeyOptionsModel).ToNot(BeNil()) - Expect(getApikeyOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getApikeyOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getApikeyOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getApikeyOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getApikeyOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetDrGrsLocationPairOptions successfully`, func() { // Construct an instance of the GetDrGrsLocationPairOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getDrGrsLocationPairOptionsModel := drAutomationServiceService.NewGetDrGrsLocationPairOptions(instanceID) - getDrGrsLocationPairOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrGrsLocationPairOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getDrGrsLocationPairOptionsModel.SetAcceptLanguage("testString") - getDrGrsLocationPairOptionsModel.SetIfNoneMatch("testString") getDrGrsLocationPairOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getDrGrsLocationPairOptionsModel).ToNot(BeNil()) - Expect(getDrGrsLocationPairOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getDrGrsLocationPairOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getDrGrsLocationPairOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getDrGrsLocationPairOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getDrGrsLocationPairOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetDrLocationsOptions successfully`, func() { // Construct an instance of the GetDrLocationsOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getDrLocationsOptionsModel := drAutomationServiceService.NewGetDrLocationsOptions(instanceID) - getDrLocationsOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrLocationsOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getDrLocationsOptionsModel.SetAcceptLanguage("testString") - getDrLocationsOptionsModel.SetIfNoneMatch("testString") getDrLocationsOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getDrLocationsOptionsModel).ToNot(BeNil()) - Expect(getDrLocationsOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getDrLocationsOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getDrLocationsOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getDrLocationsOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getDrLocationsOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetDrManagedVMOptions successfully`, func() { // Construct an instance of the GetDrManagedVMOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getDrManagedVMOptionsModel := drAutomationServiceService.NewGetDrManagedVMOptions(instanceID) - getDrManagedVMOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrManagedVMOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getDrManagedVMOptionsModel.SetAcceptLanguage("testString") - getDrManagedVMOptionsModel.SetIfNoneMatch("testString") getDrManagedVMOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getDrManagedVMOptionsModel).ToNot(BeNil()) - Expect(getDrManagedVMOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getDrManagedVMOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getDrManagedVMOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getDrManagedVMOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getDrManagedVMOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetDrSummaryOptions successfully`, func() { // Construct an instance of the GetDrSummaryOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getDrSummaryOptionsModel := drAutomationServiceService.NewGetDrSummaryOptions(instanceID) - getDrSummaryOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getDrSummaryOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getDrSummaryOptionsModel.SetAcceptLanguage("testString") - getDrSummaryOptionsModel.SetIfNoneMatch("testString") getDrSummaryOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getDrSummaryOptionsModel).ToNot(BeNil()) - Expect(getDrSummaryOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getDrSummaryOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getDrSummaryOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getDrSummaryOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getDrSummaryOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetEventOptions successfully`, func() { // Construct an instance of the GetEventOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" eventID := "00116b2a-9326-4024-839e-fb5364b76898" getEventOptionsModel := drAutomationServiceService.NewGetEventOptions(instanceID, eventID) - getEventOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getEventOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getEventOptionsModel.SetEventID("00116b2a-9326-4024-839e-fb5364b76898") getEventOptionsModel.SetAcceptLanguage("testString") - getEventOptionsModel.SetIfNoneMatch("testString") getEventOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getEventOptionsModel).ToNot(BeNil()) - Expect(getEventOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getEventOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getEventOptionsModel.EventID).To(Equal(core.StringPtr("00116b2a-9326-4024-839e-fb5364b76898"))) Expect(getEventOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getEventOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getEventOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetLastOperationOptions successfully`, func() { // Construct an instance of the GetLastOperationOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getLastOperationOptionsModel := drAutomationServiceService.NewGetLastOperationOptions(instanceID) - getLastOperationOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getLastOperationOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getLastOperationOptionsModel.SetAcceptLanguage("testString") - getLastOperationOptionsModel.SetIfNoneMatch("testString") getLastOperationOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getLastOperationOptionsModel).ToNot(BeNil()) - Expect(getLastOperationOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getLastOperationOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getLastOperationOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getLastOperationOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getLastOperationOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetMachineTypeOptions successfully`, func() { // Construct an instance of the GetMachineTypeOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" primaryWorkspaceName := "Test-workspace-wdc06" getMachineTypeOptionsModel := drAutomationServiceService.NewGetMachineTypeOptions(instanceID, primaryWorkspaceName) - getMachineTypeOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getMachineTypeOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getMachineTypeOptionsModel.SetPrimaryWorkspaceName("Test-workspace-wdc06") getMachineTypeOptionsModel.SetAcceptLanguage("testString") - getMachineTypeOptionsModel.SetIfNoneMatch("testString") getMachineTypeOptionsModel.SetStandbyWorkspaceName("Test-workspace-wdc07") getMachineTypeOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getMachineTypeOptionsModel).ToNot(BeNil()) - Expect(getMachineTypeOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getMachineTypeOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getMachineTypeOptionsModel.PrimaryWorkspaceName).To(Equal(core.StringPtr("Test-workspace-wdc06"))) Expect(getMachineTypeOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getMachineTypeOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getMachineTypeOptionsModel.StandbyWorkspaceName).To(Equal(core.StringPtr("Test-workspace-wdc07"))) Expect(getMachineTypeOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetManageDrOptions successfully`, func() { // Construct an instance of the GetManageDrOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" getManageDrOptionsModel := drAutomationServiceService.NewGetManageDrOptions(instanceID) - getManageDrOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getManageDrOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getManageDrOptionsModel.SetAcceptLanguage("testString") - getManageDrOptionsModel.SetIfNoneMatch("testString") getManageDrOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getManageDrOptionsModel).ToNot(BeNil()) - Expect(getManageDrOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getManageDrOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getManageDrOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(getManageDrOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getManageDrOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewGetPowervsWorkspacesOptions successfully`, func() { // Construct an instance of the GetPowervsWorkspacesOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" locationID := "testString" getPowervsWorkspacesOptionsModel := drAutomationServiceService.NewGetPowervsWorkspacesOptions(instanceID, locationID) - getPowervsWorkspacesOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + getPowervsWorkspacesOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") getPowervsWorkspacesOptionsModel.SetLocationID("testString") - getPowervsWorkspacesOptionsModel.SetIfNoneMatch("testString") getPowervsWorkspacesOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(getPowervsWorkspacesOptionsModel).ToNot(BeNil()) - Expect(getPowervsWorkspacesOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(getPowervsWorkspacesOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(getPowervsWorkspacesOptionsModel.LocationID).To(Equal(core.StringPtr("testString"))) - Expect(getPowervsWorkspacesOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(getPowervsWorkspacesOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewListEventsOptions successfully`, func() { // Construct an instance of the ListEventsOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" listEventsOptionsModel := drAutomationServiceService.NewListEventsOptions(instanceID) - listEventsOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + listEventsOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") listEventsOptionsModel.SetTime("2025-06-19T23:59:59Z") listEventsOptionsModel.SetFromTime("2025-06-19T00:00:00Z") listEventsOptionsModel.SetToTime("2025-06-19T23:59:59Z") listEventsOptionsModel.SetAcceptLanguage("testString") - listEventsOptionsModel.SetIfNoneMatch("testString") listEventsOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(listEventsOptionsModel).ToNot(BeNil()) - Expect(listEventsOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(listEventsOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(listEventsOptionsModel.Time).To(Equal(core.StringPtr("2025-06-19T23:59:59Z"))) Expect(listEventsOptionsModel.FromTime).To(Equal(core.StringPtr("2025-06-19T00:00:00Z"))) Expect(listEventsOptionsModel.ToTime).To(Equal(core.StringPtr("2025-06-19T23:59:59Z"))) Expect(listEventsOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(listEventsOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(listEventsOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) It(`Invoke NewUpdateApikeyOptions successfully`, func() { // Construct an instance of the UpdateApikeyOptions model - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" updateApikeyOptionsAPIKey := "adfadfdsafsdfdsf" updateApikeyOptionsModel := drAutomationServiceService.NewUpdateApikeyOptions(instanceID, updateApikeyOptionsAPIKey) - updateApikeyOptionsModel.SetInstanceID("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::") + updateApikeyOptionsModel.SetInstanceID("123456d3-1122-3344-b67d-4389b44b7bf9") updateApikeyOptionsModel.SetAPIKey("adfadfdsafsdfdsf") updateApikeyOptionsModel.SetAcceptLanguage("testString") - updateApikeyOptionsModel.SetIfNoneMatch("testString") updateApikeyOptionsModel.SetHeaders(map[string]string{"foo": "bar"}) Expect(updateApikeyOptionsModel).ToNot(BeNil()) - Expect(updateApikeyOptionsModel.InstanceID).To(Equal(core.StringPtr("crn:v1:staging:public:power-dr-automation:global:a/a123456fb04ceebfb4a9fd38c22334455:123456d3-1122-3344-b67d-4389b44b7bf9::"))) + Expect(updateApikeyOptionsModel.InstanceID).To(Equal(core.StringPtr("123456d3-1122-3344-b67d-4389b44b7bf9"))) Expect(updateApikeyOptionsModel.APIKey).To(Equal(core.StringPtr("adfadfdsafsdfdsf"))) Expect(updateApikeyOptionsModel.AcceptLanguage).To(Equal(core.StringPtr("testString"))) - Expect(updateApikeyOptionsModel.IfNoneMatch).To(Equal(core.StringPtr("testString"))) Expect(updateApikeyOptionsModel.Headers).To(Equal(map[string]string{"foo": "bar"})) }) }) diff --git a/ibm/service/drautomationservice/resource_ibm_pdr_managedr.go b/ibm/service/drautomationservice/resource_ibm_pdr_managedr.go index 775971bcad..9c98844092 100644 --- a/ibm/service/drautomationservice/resource_ibm_pdr_managedr.go +++ b/ibm/service/drautomationservice/resource_ibm_pdr_managedr.go @@ -130,38 +130,33 @@ func ResourceIbmPdrManagedr() *schema.Resource { "location_id": { Type: schema.TypeString, ForceNew: true, - Optional: true, + Required: true, }, "machine_type": { Type: schema.TypeString, - Optional: true, + Required: true, ForceNew: true, }, "orchestrator_location_type": { Type: schema.TypeString, - Optional: true, + Required: true, ForceNew: true, }, "orchestrator_name": { Type: schema.TypeString, + Required: true, ForceNew: true, - Optional: true, }, "orchestrator_password": { Type: schema.TypeString, Sensitive: true, ForceNew: true, - Optional: true, + Required: true, }, "orchestrator_workspace_id": { Type: schema.TypeString, ForceNew: true, - Optional: true, - }, - "orchestrator_workspace_location": { - Type: schema.TypeString, - ForceNew: true, - Optional: true, + Required: true, }, "region_id": { Type: schema.TypeString, @@ -173,11 +168,6 @@ func ResourceIbmPdrManagedr() *schema.Resource { ForceNew: true, Optional: true, }, - "secondary_workspace_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - }, "secret": { Type: schema.TypeString, Optional: true, @@ -208,11 +198,6 @@ func ResourceIbmPdrManagedr() *schema.Resource { Optional: true, ForceNew: true, }, - "standby_orchestrator_workspace_location": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - }, "standby_tier": { Type: schema.TypeString, Optional: true, @@ -286,9 +271,6 @@ func resourceIbmPdrManagedrCreate(ctx context.Context, d *schema.ResourceData, m if _, ok := d.GetOk("orchestrator_workspace_id"); ok { createManageDrOptions.SetOrchestratorWorkspaceID(d.Get("orchestrator_workspace_id").(string)) } - if _, ok := d.GetOk("orchestrator_workspace_location"); ok { - createManageDrOptions.SetOrchestratorWorkspaceLocation(d.Get("orchestrator_workspace_location").(string)) - } if _, ok := d.GetOk("region_id"); ok { createManageDrOptions.SetRegionID(d.Get("region_id").(string)) } @@ -304,9 +286,6 @@ func resourceIbmPdrManagedrCreate(ctx context.Context, d *schema.ResourceData, m if _, ok := d.GetOk("resource_instance"); ok { createManageDrOptions.SetResourceInstance(d.Get("resource_instance").(string)) } - if _, ok := d.GetOk("secondary_workspace_id"); ok { - createManageDrOptions.SetSecondaryWorkspaceID(d.Get("secondary_workspace_id").(string)) - } if _, ok := d.GetOk("secret"); ok { createManageDrOptions.SetSecret(d.Get("secret").(string)) } @@ -325,9 +304,6 @@ func resourceIbmPdrManagedrCreate(ctx context.Context, d *schema.ResourceData, m if _, ok := d.GetOk("standby_orchestrator_workspace_id"); ok { createManageDrOptions.SetStandbyOrchestratorWorkspaceID(d.Get("standby_orchestrator_workspace_id").(string)) } - if _, ok := d.GetOk("standby_orchestrator_workspace_location"); ok { - createManageDrOptions.SetStandbyOrchestratorWorkspaceLocation(d.Get("standby_orchestrator_workspace_location").(string)) - } if _, ok := d.GetOk("standby_tier"); ok { createManageDrOptions.SetStandbyTier(d.Get("standby_tier").(string)) } @@ -337,14 +313,11 @@ func resourceIbmPdrManagedrCreate(ctx context.Context, d *schema.ResourceData, m if _, ok := d.GetOk("accept_language"); ok { createManageDrOptions.SetAcceptLanguage(d.Get("accept_language").(string)) } - // if _, ok := d.GetOk("if_none_match"); ok { - // createManageDrOptions.SetIfNoneMatch(d.Get("if_none_match").(string)) - // } if _, ok := d.GetOk("accepts_incomplete"); ok { createManageDrOptions.SetAcceptsIncomplete(d.Get("accepts_incomplete").(bool)) } - serviceInstanceManageDr, response, err := drAutomationServiceClient.CreateManageDrWithContext(ctx, createManageDrOptions) + _, response, err := drAutomationServiceClient.CreateManageDrWithContext(ctx, createManageDrOptions) if err != nil { detailedMsg := fmt.Sprintf("CreateManageDrWithContext failed: %s", err.Error()) // Include HTTP status & raw body if available @@ -359,7 +332,7 @@ func resourceIbmPdrManagedrCreate(ctx context.Context, d *schema.ResourceData, m return tfErr.GetDiag() } - d.SetId(fmt.Sprintf("%s", *serviceInstanceManageDr.ID)) + d.SetId(d.Get("instance_id").(string)) // Step 2: Poll Last Operation status every 5 minutes until Active or Fail instanceID := *createManageDrOptions.InstanceID const ( @@ -482,7 +455,7 @@ func resourceIbmPdrManagedrRead(context context.Context, d *schema.ResourceData, getManageDrOptions := &drautomationservicev1.GetManageDrOptions{} - instanceID := d.Get("instance_id").(string) + instanceID := d.Id() log.Printf("[DEBUG] Read operation using instance ID from resource: %s", instanceID) @@ -491,9 +464,6 @@ func resourceIbmPdrManagedrRead(context context.Context, d *schema.ResourceData, // if _, ok := d.GetOk("accept_language"); ok { // getManageDrOptions.SetAcceptLanguage(d.Get("accept_language").(string)) // } - // if _, ok := d.GetOk("if_none_match"); ok { - // getManageDrOptions.SetIfNoneMatch(d.Get("if_none_match").(string)) - // } serviceInstanceManageDr, response, err := drAutomationServiceClient.GetManageDrWithContext(context, getManageDrOptions) if err != nil { diff --git a/ibm/service/drautomationservice/resource_ibm_pdr_validate_apikey_test.go b/ibm/service/drautomationservice/resource_ibm_pdr_validate_apikey_test.go index 145ddebc94..a3af8f2c24 100644 --- a/ibm/service/drautomationservice/resource_ibm_pdr_validate_apikey_test.go +++ b/ibm/service/drautomationservice/resource_ibm_pdr_validate_apikey_test.go @@ -19,7 +19,7 @@ import ( func TestAccIBMPdrValidateApikeyBasic(t *testing.T) { var conf drautomationservicev1.ValidationKeyResponse - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheck(t) }, @@ -38,7 +38,7 @@ func TestAccIBMPdrValidateApikeyBasic(t *testing.T) { func TestAccIBMPdrValidateApikeyAllArgs(t *testing.T) { var conf drautomationservicev1.ValidationKeyResponse - instanceID := "crn:v1:staging:public:power-dr-automation:global:a/b68c234e719144b18598ae4a7b80c44c:492fef47-3ebf-4090-b089-e9b4199878b6::" + instanceID := "123456d3-1122-3344-b67d-4389b44b7bf9" acceptLanguage := fmt.Sprintf("tf_accept_language_%d", acctest.RandIntRange(10, 100)) acceptLanguageUpdate := fmt.Sprintf("tf_accept_language_%d", acctest.RandIntRange(10, 100))