Skip to content

Commit 34cbf4e

Browse files
michaelkadmichaelkad
authored
[R][D] Compatibility Mode (IBM-Cloud#6455)
* [R][D] Compatibility Mode Add: - effective_processor_compatibility_mode - preferred_processor_compatibility_mode Update power-version Update doc * update go.sum
1 parent 20c05c1 commit 34cbf4e

9 files changed

+502
-384
lines changed

‎go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20250912140913-e279174fe80b h1:KvUKPR6fCk
9494
github.com/IBM-Cloud/bluemix-go v0.0.0-20250912140913-e279174fe80b/go.mod h1:uqxINL7UuXasMI5Y3yGBh5izcsIksdIGxgQ78oM+5Dk=
9595
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113 h1:f2Erqfea1dKpaTFagTJM6W/wnD3JGq/Vn9URh8nuRwk=
9696
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY=
97-
github.com/IBM-Cloud/power-go-client v1.12.0 h1:tF9Mq5GLYHebpzQT6IYB89lIxEST1E9teuchjxSAaw0=
98-
github.com/IBM-Cloud/power-go-client v1.12.0/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
9997
github.com/IBM-Cloud/power-go-client v1.13.0 h1:TqxPlkJe0VkNdV9hYOD5NRepxEFhhyKXWXfg22x2zhU=
10098
github.com/IBM-Cloud/power-go-client v1.13.0/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
10199
github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKOj/Ug9nbKNw=

‎ibm/service/power/data_source_ibm_pi_instance.go‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ func DataSourceIBMPIInstance() *schema.Resource {
5050
Description: "The custom deployment type.",
5151
Type: schema.TypeString,
5252
},
53+
Attr_EffectiveProcessorCompatibilityMode: {
54+
Computed: true,
55+
Description: "Effective processor compatibility mode.",
56+
Type: schema.TypeString,
57+
},
5358
Attr_Fault: {
5459
Computed: true,
5560
Description: "Fault information.",
@@ -186,6 +191,11 @@ func DataSourceIBMPIInstance() *schema.Resource {
186191
Description: "The ID of the placement group that the instance is a member.",
187192
Type: schema.TypeString,
188193
},
194+
Attr_PreferredProcessorCompatibilityMode: {
195+
Computed: true,
196+
Description: "Preferred processor compatibility mode.",
197+
Type: schema.TypeString,
198+
},
189199
Attr_Processors: {
190200
Computed: true,
191201
Description: "The number of processors that are allocated to the instance.",
@@ -310,8 +320,10 @@ func dataSourceIBMPIInstancesRead(ctx context.Context, d *schema.ResourceData, m
310320
}
311321
d.Set(Attr_UserTags, tags)
312322
}
323+
313324
d.Set(Attr_DedicatedHostID, powervmdata.DedicatedHostID)
314325
d.Set(Attr_DeploymentType, powervmdata.DeploymentType)
326+
d.Set(Attr_EffectiveProcessorCompatibilityMode, powervmdata.EffectiveProcessorCompatibilityMode)
315327
d.Set(Attr_LicenseRepositoryCapacity, powervmdata.LicenseRepositoryCapacity)
316328
d.Set(Attr_MaxMem, powervmdata.Maxmem)
317329
d.Set(Attr_MaxProc, powervmdata.Maxproc)
@@ -322,18 +334,19 @@ func dataSourceIBMPIInstancesRead(ctx context.Context, d *schema.ResourceData, m
322334
d.Set(Attr_MinVirtualCores, powervmdata.VirtualCores.Min)
323335
d.Set(Attr_Networks, flattenPvmInstanceNetworks(powervmdata.Networks))
324336
d.Set(Attr_PinPolicy, powervmdata.PinPolicy)
337+
d.Set(Attr_PreferredProcessorCompatibilityMode, powervmdata.PreferredProcessorCompatibilityMode)
325338
d.Set(Attr_Processors, powervmdata.Processors)
326339
d.Set(Attr_ProcType, powervmdata.ProcType)
327340
d.Set(Attr_ServerName, powervmdata.ServerName)
328341
d.Set(Attr_SharedProcessorPool, powervmdata.SharedProcessorPool)
329342
d.Set(Attr_SharedProcessorPoolID, powervmdata.SharedProcessorPoolID)
330343
d.Set(Attr_Status, powervmdata.Status)
331344
d.Set(Attr_StorageConnection, powervmdata.StorageConnection)
332-
d.Set(Attr_StorageType, powervmdata.StorageType)
333345
d.Set(Attr_StoragePool, powervmdata.StoragePool)
334346
d.Set(Attr_StoragePoolAffinity, powervmdata.StoragePoolAffinity)
335-
d.Set(Attr_Volumes, powervmdata.VolumeIDs)
347+
d.Set(Attr_StorageType, powervmdata.StorageType)
336348
d.Set(Attr_VirtualCoresAssigned, powervmdata.VirtualCores.Assigned)
349+
d.Set(Attr_Volumes, powervmdata.VolumeIDs)
337350

338351
if *powervmdata.PlacementGroup != "none" {
339352
d.Set(Attr_PlacementGroupID, powervmdata.PlacementGroup)

‎ibm/service/power/data_source_ibm_pi_instances.go‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ func DataSourceIBMPIInstances() *schema.Resource {
4747
Description: "The dedicated host ID where the shared processor pool resides.",
4848
Type: schema.TypeString,
4949
},
50+
Attr_EffectiveProcessorCompatibilityMode: {
51+
Computed: true,
52+
Description: "Effective processor compatibility mode.",
53+
Type: schema.TypeString,
54+
},
5055
Attr_Fault: {
5156
Computed: true,
5257
Description: "Fault information.",
@@ -162,6 +167,11 @@ func DataSourceIBMPIInstances() *schema.Resource {
162167
Description: "The ID of the placement group that the instance is a member.",
163168
Type: schema.TypeString,
164169
},
170+
Attr_PreferredProcessorCompatibilityMode: {
171+
Computed: true,
172+
Description: "Preferred processor compatibility mode.",
173+
Type: schema.TypeString,
174+
},
165175
Attr_Processors: {
166176
Computed: true,
167177
Description: "The number of processors that are allocated to the instance.",
@@ -292,30 +302,32 @@ func flattenPvmInstances(list []*models.PVMInstanceReference, meta any) []map[st
292302
result := make([]map[string]any, 0, len(list))
293303
for _, i := range list {
294304
l := map[string]any{
295-
Attr_DedicatedHostID: i.DedicatedHostID,
296-
Attr_LicenseRepositoryCapacity: i.LicenseRepositoryCapacity,
297-
Attr_MaxMem: i.Maxmem,
298-
Attr_MaxProc: i.Maxproc,
299-
Attr_MaxVirtualCores: i.VirtualCores.Max,
300-
Attr_Memory: *i.Memory,
301-
Attr_MinMem: i.Minmem,
302-
Attr_MinProc: i.Minproc,
303-
Attr_MinVirtualCores: i.VirtualCores.Min,
304-
Attr_Networks: flattenPvmInstanceNetworks(i.Networks),
305-
Attr_PinPolicy: i.PinPolicy,
306-
Attr_PlacementGroupID: i.PlacementGroup,
307-
Attr_Processors: *i.Processors,
308-
Attr_ProcType: *i.ProcType,
309-
Attr_PVMInstanceID: *i.PvmInstanceID,
310-
Attr_ServerName: i.ServerName,
311-
Attr_SharedProcessorPool: i.SharedProcessorPool,
312-
Attr_SharedProcessorPoolID: i.SharedProcessorPoolID,
313-
Attr_Status: *i.Status,
314-
Attr_StorageConnection: i.StorageConnection,
315-
Attr_StoragePool: i.StoragePool,
316-
Attr_StoragePoolAffinity: i.StoragePoolAffinity,
317-
Attr_StorageType: i.StorageType,
318-
Attr_VirtualCoresAssigned: i.VirtualCores.Assigned,
305+
Attr_DedicatedHostID: i.DedicatedHostID,
306+
Attr_EffectiveProcessorCompatibilityMode: i.EffectiveProcessorCompatibilityMode,
307+
Attr_LicenseRepositoryCapacity: i.LicenseRepositoryCapacity,
308+
Attr_MaxMem: i.Maxmem,
309+
Attr_MaxProc: i.Maxproc,
310+
Attr_MaxVirtualCores: i.VirtualCores.Max,
311+
Attr_Memory: *i.Memory,
312+
Attr_MinMem: i.Minmem,
313+
Attr_MinProc: i.Minproc,
314+
Attr_MinVirtualCores: i.VirtualCores.Min,
315+
Attr_Networks: flattenPvmInstanceNetworks(i.Networks),
316+
Attr_PinPolicy: i.PinPolicy,
317+
Attr_PlacementGroupID: i.PlacementGroup,
318+
Attr_PreferredProcessorCompatibilityMode: i.PreferredProcessorCompatibilityMode,
319+
Attr_Processors: *i.Processors,
320+
Attr_ProcType: *i.ProcType,
321+
Attr_PVMInstanceID: *i.PvmInstanceID,
322+
Attr_ServerName: i.ServerName,
323+
Attr_SharedProcessorPool: i.SharedProcessorPool,
324+
Attr_SharedProcessorPoolID: i.SharedProcessorPoolID,
325+
Attr_Status: *i.Status,
326+
Attr_StorageConnection: i.StorageConnection,
327+
Attr_StoragePool: i.StoragePool,
328+
Attr_StoragePoolAffinity: i.StoragePoolAffinity,
329+
Attr_StorageType: i.StorageType,
330+
Attr_VirtualCoresAssigned: i.VirtualCores.Assigned,
319331
}
320332

321333
if i.Crn != "" {

0 commit comments

Comments
 (0)