From d98de3282cb72aeb5d478972e6e6268bc49c66b9 Mon Sep 17 00:00:00 2001 From: Kalle Carlbark Date: Wed, 9 Feb 2022 09:59:14 +0100 Subject: [PATCH] Update netbox dto's --- .gitconfig | 3 +++ cluster_types.go | 63 +++++++++++++++++++++++++++++++++++------------- device_roles.go | 41 +++++++++++++++++++++---------- platforms.go | 58 ++++++++++++++++++++++++++------------------ 4 files changed, 111 insertions(+), 54 deletions(-) diff --git a/.gitconfig b/.gitconfig index 09bca45..8003e59 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,2 +1,5 @@ [core] sshCommand = "/usr/bin/ssh" +[user] + name = Kalle Carlbark + email = kalle.carlbark@kcbark.net diff --git a/cluster_types.go b/cluster_types.go index ff3be52..e6a5a38 100644 --- a/cluster_types.go +++ b/cluster_types.go @@ -13,22 +13,31 @@ type ClusterTypesService service // ClusterTypes is used to list cluster types type ClusterTypes struct { - Next interface{} `json:"next"` - Previous interface{} `json:"previous"` - Results []struct { - CustomFields struct{} `json:"custom_fields"` - LastUpdated time.Time `json:"last_updated"` - Display string `json:"display"` - Slug string `json:"slug"` - Description string `json:"description"` - URL string `json:"url"` - Created string `json:"created"` - Name string `json:"name"` - Tags []interface{} `json:"tags"` - ID int `json:"id"` - ClusterCount int `json:"cluster_count"` - } `json:"results"` - Count int `json:"count"` + Next interface{} `json:"next"` + Previous interface{} `json:"previous"` + Results []ClusterType `json:"results"` + Count int `json:"count"` +} + +type ClusterType struct { + CustomFields struct{} `json:"custom_fields"` + LastUpdated time.Time `json:"last_updated"` + Display string `json:"display"` + Slug string `json:"slug"` + Description string `json:"description"` + URL string `json:"url"` + Created string `json:"created"` + Name string `json:"name"` + Tags []struct { + URL string `json:"url"` + Display string `json:"display"` + Name string `json:"name"` + Slug string `json:"slug"` + Color string `json:"color"` + ID int `json:"id"` + } `json:"tags"` + ID int `json:"id"` + ClusterCount int `json:"cluster_count"` } // ClusterTypeFilter is used to filter out VirtualizationClusters @@ -52,7 +61,7 @@ type ClusterTypeFilter struct { Limit int64 `schema:"limit,omitempty"` } -const clusterTypesPath = "/cluster-types/" +const clusterTypesPath = virtualizationPath + "/cluster-types/" // List cluster types. ClusterTypeFilter is used to list based on filter queries. func (s *ClusterTypesService) List(ctx context.Context, f *ClusterTypeFilter) (*ClusterTypes, error) { @@ -82,3 +91,23 @@ func (s *ClusterTypesService) List(ctx context.Context, f *ClusterTypeFilter) (* return &clusterTypes, nil } + +// Get cluster type. +func (s *ClusterTypesService) Get(ctx context.Context, id string) (*ClusterTypes, error) { + var clusterTypes ClusterTypes + var query string + var req *http.Request + var err error + + req, err = s.client.newRequest(ctx, "GET", clusterTypesPath+id+"/", query, nil) + if err != nil { + return &clusterTypes, err + } + + _, err = s.client.do(req, &clusterTypes) + if err != nil { + return &clusterTypes, err + } + + return &clusterTypes, nil +} diff --git a/device_roles.go b/device_roles.go index 8e93041..21c6f69 100644 --- a/device_roles.go +++ b/device_roles.go @@ -4,36 +4,48 @@ import ( "context" "net/http" "net/url" + "time" "github.com/gorilla/schema" ) type DeviceRolesService service +// DeviceRoles is used to list device roles type DeviceRoles struct { - Count int `json:"count"` Next string `json:"next"` Previous string `json:"previous"` Results []DeviceRole `json:"results"` + Count int `json:"count"` } +// DeviceRole is a role of a device type DeviceRole struct { - ID int `json:"id"` - URL string `json:"url"` - Name string `json:"name"` - Slug string `json:"slug"` - Color string `json:"color"` - VMRole bool `json:"vm_role"` - Description string `json:"description"` - DeviceCount int `json:"device_count"` - VirtualmachineCount int `json:"virtualmachine_count"` + LastUpdated time.Time `json:"last_updated"` + CustomFields struct{} `json:"custom_fields"` + URL string `json:"url"` + Display string `json:"display"` + Slug string `json:"slug"` + Color string `json:"color"` + Created string `json:"created"` + Description string `json:"description"` + Name string `json:"name"` + Tags []struct { + URL string `json:"url"` + Display string `json:"display"` + Name string `json:"name"` + Slug string `json:"slug"` + Color string `json:"color"` + ID int `json:"id"` + } `json:"tags"` + ID int `json:"id"` + DeviceCount int `json:"device_count"` + VirtualMachineCount int `json:"virtualmachine_count"` + VMRole bool `json:"vm_role"` } // DeviceTypeFilter is used to filter dcim_device_roles query to the Netbox API type DeviceRoleFilter struct { - Offset int64 `schema:"offset,omitempty"` - Limit int64 `schema:"limit,omitempty"` - // User specific filters ID string `schema:"id,omitempty"` Name string `schema:"name,omitempty"` @@ -41,6 +53,9 @@ type DeviceRoleFilter struct { Color string `schema:"color,omitempty"` VMRole string `schema:"vm_role,omitempty"` Q string `schema:"q,omitempty"` + + Offset int64 `schema:"offset,omitempty"` + Limit int64 `schema:"limit,omitempty"` } const deviceRolesPath = dcimPath + "/device-roles" diff --git a/platforms.go b/platforms.go index 03556a9..95eb0b5 100644 --- a/platforms.go +++ b/platforms.go @@ -15,29 +15,39 @@ type Platforms struct { Count int `json:"count"` Next interface{} `json:"next"` Previous interface{} `json:"previous"` - Results []struct { - ID int `json:"id"` - URL string `json:"url"` - Display string `json:"display"` - Name string `json:"name"` - Slug string `json:"slug"` - Manufacturer struct { - ID int `json:"id"` - URL string `json:"url"` - Display string `json:"display"` - Name string `json:"name"` - Slug string `json:"slug"` - } `json:"manufacturer"` - NapalmDriver string `json:"napalm_driver"` - NapalmArgs interface{} `json:"napalm_args"` - Description string `json:"description"` - Tags []interface{} `json:"tags"` - CustomFields struct{} `json:"custom_fields"` - Created string `json:"created"` - LastUpdated time.Time `json:"last_updated"` - DeviceCount int `json:"device_count"` - VirtualmachineCount int `json:"virtualmachine_count"` - } `json:"results"` + Results []Platform `json:"results"` +} + +type Platform struct { + ID int `json:"id"` + URL string `json:"url"` + Display string `json:"display"` + Name string `json:"name"` + Slug string `json:"slug"` + Manufacturer struct { + ID int `json:"id"` + URL string `json:"url"` + Display string `json:"display"` + Name string `json:"name"` + Slug string `json:"slug"` + DevicetypeCount int `json:"devicetype_count"` + } `json:"manufacturer"` + NapalmDriver string `json:"napalm_driver"` + NapalmArgs string `json:"napalm_args"` + Description string `json:"description"` + Tags []struct { + ID int `json:"id"` + URL string `json:"url"` + Display string `json:"display"` + Name string `json:"name"` + Slug string `json:"slug"` + Color string `json:"color"` + } `json:"tags"` + CustomFields struct{} `json:"custom_fields"` + Created string `json:"created"` + LastUpdated time.Time `json:"last_updated"` + DeviceCount int `json:"device_count"` + VirtualmachineCount int `json:"virtualmachine_count"` } // PlatformFilter is used to filter out platforms @@ -61,7 +71,7 @@ type PlatformFilter struct { Limit int64 `schema:"limit,omitempty"` } -const platformsPath = "/platforms/" +const platformsPath = dcimPath + "/platforms/" // List platforms. PlatformFilter is used to list based on filter queries. func (s *PlatformsService) List(ctx context.Context, f *PlatformFilter) (*Platforms, error) {