Skip to content

Commit 570afbd

Browse files
fmunozmirandafmunozmiranda
authored
Merge pull request #14 from cisco-en-programmability/develop
* The provider has been updated with Catalyst Center API version `3.1.0.3`
2 parents efee990 + 8479837 commit 570afbd

File tree

2,449 files changed

+43241
-44465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,449 files changed

+43241
-44465
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.2.0-beta (March 17, 2025)
2+
IMPROVEMENTS:
3+
* The provider has been updated with Catalyst Center API version `3.1.0.3`
4+
15
## 1.1.1-beta (February 25, 2025)
26
IMPROVEMENTS:
37
* Modifying the return values of the Resource interface_update functions.

‎catalystcenter/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package catalystcenter
33
import (
44
"context"
55

6-
catalystcentersdkgo "github.com/cisco-en-programmability/catalystcenter-go-sdk/v2/sdk"
6+
catalystcentersdkgo "github.com/cisco-en-programmability/catalystcenter-go-sdk/v3/sdk"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -47,7 +47,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
4747
if err != nil {
4848
diags = append(diags, diag.Diagnostic{
4949
Severity: diag.Error,
50-
Summary: "Unable to create Cisco DNA Center client",
50+
Summary: "Unable to create Cisco Catalyst Center client",
5151
Detail: err.Error(),
5252
})
5353
return nil, diags

‎catalystcenter/convert.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ func interfaceToFloat64Ptr(item interface{}) *float64 {
1515
return &nnItem
1616
}
1717

18+
func interfaceToFloat64PtrArray(item interface{}) *[]float64 {
19+
nItem := interfaceToSliceString(item)
20+
nnItem := []float64{}
21+
for _, v := range nItem {
22+
nnItem = append(nnItem, *stringToFloat64Ptr(v))
23+
}
24+
return &nnItem
25+
}
26+
1827
func mapInterfaceToMapString(m map[string]interface{}) map[string]string {
1928
new_m := map[string]string{}
2029
for k, v := range m {

‎catalystcenter/data_source_aaa_services.go‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"log"
77

8-
catalystcentersdkgo "github.com/cisco-en-programmability/catalystcenter-go-sdk/v2/sdk"
8+
catalystcentersdkgo "github.com/cisco-en-programmability/catalystcenter-go-sdk/v3/sdk"
99

1010
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -25,25 +25,26 @@ programmability/catalyst-center-api-specs/blob/main/Assurance/CE_Cat_Center_Org-
2525
"device_id": &schema.Schema{
2626
Description: `deviceId query parameter. The device UUID.
2727
28+
2829
Examples:
29-
deviceId=6bef213c-19ca-4170-8375-b694e251101c (single deviceId is requested)
30-
deviceId=6bef213c-19ca-4170-8375-b694e251101c&deviceId=32219612-819e-4b5e-a96b-cf22aca13dd9 (multiple networkDeviceIds with & separator)
30+
**deviceId=6bef213c-19ca-4170-8375-b694e251101c** (single deviceId is requested)
31+
**deviceId=6bef213c-19ca-4170-8375-b694e251101c&deviceId=32219612-819e-4b5e-a96b-cf22aca13dd9 (multiple networkDeviceIds with & separator)
3132
`,
3233
Type: schema.TypeString,
3334
Optional: true,
3435
},
3536
"device_name": &schema.Schema{
36-
Description: `deviceName query parameter. Name of the device. This parameter supports wildcard (*) character -based search. Example: wnbu-sjc* or *wnbu-sjc* or *wnbu-sjc Examples: deviceName=wnbu-sjc24.cisco.com (single device name is requested) deviceName=wnbu-sjc24.cisco.com&deviceName=wnbu-sjc22.cisco.com (multiple device names are requested)
37+
Description: `deviceName query parameter. Name of the device. This parameter supports wildcard (*****) character -based search. Example: **wnbu-sjc*** or ***wnbu-sjc*** or ***wnbu-sjc** Examples: deviceName=wnbu-sjc24.cisco.com (single device name is requested) deviceName=wnbu-sjc24.cisco.com&deviceName=wnbu-sjc22.cisco.com (multiple device names are requested)
3738
`,
3839
Type: schema.TypeString,
3940
Optional: true,
4041
},
4142
"device_site_hierarchy_id": &schema.Schema{
42-
Description: `deviceSiteHierarchyId query parameter. The full hierarchy breakdown of the site tree in id form starting from Global site UUID and ending with the specific site UUID. (Ex. globalUuid/areaUuid/buildingUuid/floorUuid)
43-
This field supports wildcard asterisk (*) character search support. E.g. *uuid*, *uuid, uuid*
43+
Description: `deviceSiteHierarchyId query parameter. The full hierarchy breakdown of the site tree in id form starting from Global site UUID and ending with the specific site UUID. (Ex. **globalUuid/areaUuid/buildingUuid/floorUuid**)
44+
This field supports wildcard asterisk (*****) character search support. E.g. ***uuid*, *uuid, uuid***
4445
Examples:
45-
?deviceSiteHierarchyId=globalUuid/areaUuid/buildingUuid/floorUuid (single siteHierarchyId requested)
46-
?deviceSiteHierarchyId=globalUuid/areaUuid/buildingUuid/floorUuid&deviceSiteHierarchyId=globalUuid/areaUuid2/buildingUuid2/floorUuid2 (multiple siteHierarchyIds requested)
46+
**?deviceSiteHierarchyId=globalUuid/areaUuid/buildingUuid/floorUuid **(single siteHierarchyId requested)
47+
**?deviceSiteHierarchyId=globalUuid/areaUuid/buildingUuid/floorUuid&deviceSiteHierarchyId=globalUuid/areaUuid2/buildingUuid2/floorUuid2** (multiple siteHierarchyIds requested)
4748
`,
4849
Type: schema.TypeString,
4950
Optional: true,
@@ -73,26 +74,26 @@ Examples:
7374
Optional: true,
7475
},
7576
"server_ip": &schema.Schema{
76-
Description: `serverIp query parameter. IP Address of the AAA Server. This parameter supports wildcard (*) character -based search. Example: 10.76.81.* or *56.78* or *50.28 Examples: serverIp=10.42.3.31 (single IP Address is requested) serverIp=10.42.3.31&serverIp=name2&fabricVnName=name3 (multiple IP Addresses are requested)
77+
Description: `serverIp query parameter. IP Address of the AAA Server. This parameter supports wildcard (*****) character -based search. Example: **10.76.81.*** or ***56.78*** or ***50.28** Examples: serverIp=10.42.3.31 (single IP Address is requested) serverIp=10.42.3.31&serverIp=name2&fabricVnName=name3 (multiple IP Addresses are requested)
7778
`,
7879
Type: schema.TypeString,
7980
Optional: true,
8081
},
8182
"site_hierarchy": &schema.Schema{
82-
Description: `siteHierarchy query parameter. The full hierarchical breakdown of the site tree starting from Global site name and ending with the specific site name. The Root site is named "Global" (Ex. Global/AreaName/BuildingName/FloorName)
83-
This field supports wildcard asterisk (*) character search support. E.g. */San*, */San, /San*
83+
Description: `siteHierarchy query parameter. The full hierarchical breakdown of the site tree starting from Global site name and ending with the specific site name. The Root site is named "Global" (Ex. **Global/AreaName/BuildingName/FloorName**)
84+
This field supports wildcard asterisk (*****) character search support. E.g. ***/San*, */San, /San***
8485
Examples:
85-
?siteHierarchy=Global/AreaName/BuildingName/FloorName (single siteHierarchy requested)
86-
?siteHierarchy=Global/AreaName/BuildingName/FloorName&siteHierarchy=Global/AreaName2/BuildingName2/FloorName2 (multiple siteHierarchies requested)
86+
**?siteHierarchy=Global/AreaName/BuildingName/FloorName** (single siteHierarchy requested)
87+
**?siteHierarchy=Global/AreaName/BuildingName/FloorName&siteHierarchy=Global/AreaName2/BuildingName2/FloorName2** (multiple siteHierarchies requested)
8788
`,
8889
Type: schema.TypeString,
8990
Optional: true,
9091
},
9192
"site_id": &schema.Schema{
92-
Description: `siteId query parameter. The UUID of the site. (Ex. flooruuid)
93+
Description: `siteId query parameter. The UUID of the site. (Ex. **flooruuid**)
9394
Examples:
94-
?siteId=id1 (single id requested)
95-
?siteId=id1&siteId=id2&siteId=id3 (multiple ids requested)
95+
**?siteId=id1** (single id requested)
96+
**?siteId=id1&siteId=id2&siteId=id3** (multiple ids requested)
9697
`,
9798
Type: schema.TypeString,
9899
Optional: true,
@@ -105,7 +106,7 @@ Examples:
105106
},
106107
"start_time": &schema.Schema{
107108
Description: `startTime query parameter. Start time from which API queries the data set related to the resource. It must be specified in UNIX epochtime in milliseconds. Value is inclusive.
108-
If startTime is not provided, API will default to current time.
109+
If **startTime** is not provided, API will default to current time.
109110
`,
110111
Type: schema.TypeFloat,
111112
Optional: true,
@@ -269,10 +270,10 @@ func dataSourceAAAServicesRead(ctx context.Context, d *schema.ResourceData, m in
269270

270271
selectedMethod := 1
271272
if selectedMethod == 1 {
272-
log.Printf("[DEBUG] Selected method: RetrievesTheListOfAAAServicesForGivenParametersV1")
273+
log.Printf("[DEBUG] Selected method: RetrievesTheListOfAAAServicesForGivenParameters")
273274

274-
headerParams1 := catalystcentersdkgo.RetrievesTheListOfAAAServicesForGivenParametersV1HeaderParams{}
275-
queryParams1 := catalystcentersdkgo.RetrievesTheListOfAAAServicesForGivenParametersV1QueryParams{}
275+
headerParams1 := catalystcentersdkgo.RetrievesTheListOfAAAServicesForGivenParametersHeaderParams{}
276+
queryParams1 := catalystcentersdkgo.RetrievesTheListOfAAAServicesForGivenParametersQueryParams{}
276277

277278
if okStartTime {
278279
queryParams1.StartTime = vStartTime.(float64)
@@ -314,24 +315,36 @@ func dataSourceAAAServicesRead(ctx context.Context, d *schema.ResourceData, m in
314315

315316
// has_unknown_response: None
316317

317-
response1, restyResp1, err := client.Devices.RetrievesTheListOfAAAServicesForGivenParametersV1(&headerParams1, &queryParams1)
318+
response1, restyResp1, err := client.Devices.RetrievesTheListOfAAAServicesForGivenParameters(&headerParams1, &queryParams1)
319+
320+
if err != nil || response1 == nil {
321+
if restyResp1 != nil {
322+
log.Printf("[DEBUG] Retrieved error response %s", restyResp1.String())
323+
}
324+
diags = append(diags, diagErrorWithAlt(
325+
"Failure when executing 2 RetrievesTheListOfAAAServicesForGivenParameters", err,
326+
"Failure at RetrievesTheListOfAAAServicesForGivenParameters, unexpected response", ""))
327+
return diags
328+
}
329+
330+
log.Printf("[DEBUG] Retrieved response %+v", responseInterfaceToString(*response1))
318331

319332
if err != nil || response1 == nil {
320333
if restyResp1 != nil {
321334
log.Printf("[DEBUG] Retrieved error response %s", restyResp1.String())
322335
}
323336
diags = append(diags, diagErrorWithAlt(
324-
"Failure when executing 2 RetrievesTheListOfAAAServicesForGivenParametersV1", err,
325-
"Failure at RetrievesTheListOfAAAServicesForGivenParametersV1, unexpected response", ""))
337+
"Failure when executing 2 RetrievesTheListOfAAAServicesForGivenParameters", err,
338+
"Failure at RetrievesTheListOfAAAServicesForGivenParameters, unexpected response", ""))
326339
return diags
327340
}
328341

329342
log.Printf("[DEBUG] Retrieved response %+v", responseInterfaceToString(*response1))
330343

331-
vItems1 := flattenDevicesRetrievesTheListOfAAAServicesForGivenParametersV1Items(response1.Response)
344+
vItems1 := flattenDevicesRetrievesTheListOfAAAServicesForGivenParametersItems(response1.Response)
332345
if err := d.Set("items", vItems1); err != nil {
333346
diags = append(diags, diagError(
334-
"Failure when setting RetrievesTheListOfAAAServicesForGivenParametersV1 response",
347+
"Failure when setting RetrievesTheListOfAAAServicesForGivenParameters response",
335348
err))
336349
return diags
337350
}
@@ -343,7 +356,7 @@ func dataSourceAAAServicesRead(ctx context.Context, d *schema.ResourceData, m in
343356
return diags
344357
}
345358

346-
func flattenDevicesRetrievesTheListOfAAAServicesForGivenParametersV1Items(items *[]catalystcentersdkgo.ResponseDevicesRetrievesTheListOfAAAServicesForGivenParametersV1Response) []map[string]interface{} {
359+
func flattenDevicesRetrievesTheListOfAAAServicesForGivenParametersItems(items *[]catalystcentersdkgo.ResponseDevicesRetrievesTheListOfAAAServicesForGivenParametersResponse) []map[string]interface{} {
347360
if items == nil {
348361
return nil
349362
}

0 commit comments

Comments
 (0)