fix: Export files not working with Netbox 3.3

fixes: #187
smutel · Mar 14, 2023 · 6cd4162 · 6cd4162
1 parent 9eb660b
commit 6cd4162
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/examples/exports/v3.2/netbox_virtualization_cluster types.csv b/examples/exports/v3.2/netbox_virtualization_cluster types.csv
diff --git a/examples/exports/v3.2/netbox_virtualization_clusters.csv b/examples/exports/v3.2/netbox_virtualization_clusters.csv
diff --git a/...exports/v3.2/netbox_dcim_device roles.csv → ...exports/v3.3/netbox_dcim_device roles.csv b/...exports/v3.2/netbox_dcim_device roles.csv → ...exports/v3.3/netbox_dcim_device roles.csv
diff --git a/...es/exports/v3.2/netbox_dcim_platforms.csv → ...es/exports/v3.3/netbox_dcim_platforms.csv b/...es/exports/v3.2/netbox_dcim_platforms.csv → ...es/exports/v3.3/netbox_dcim_platforms.csv
diff --git a/examples/exports/v3.2/netbox_dcim_sites.csv → examples/exports/v3.3/netbox_dcim_sites.csv b/examples/exports/v3.2/netbox_dcim_sites.csv → examples/exports/v3.3/netbox_dcim_sites.csv
diff --git a/...orts/v3.2/netbox_extras_custom fields.csv → ...orts/v3.3/netbox_extras_custom fields.csv b/...orts/v3.2/netbox_extras_custom fields.csv → ...orts/v3.3/netbox_extras_custom fields.csv
@@ -1,11 +1,11 @@
-name,content_types,label,type,required,description,weight,default,filter_logic,choices,object_type
-cf_boolean,"virtualization.virtualmachine,tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,ipam.vlan,ipam.service,ipam.iprange","Boolean field",boolean,False,,100,,loose,,
-cf_date,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,date,False,,100,,loose,,
-cf_integer,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,integer,False,,100,,loose,,
-cf_multi_selection,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,multiselect,False,,100,,loose,"0,1",
-cf_selection,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,select,False,,100,,loose,"0,1",
-cf_text,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,text,False,,100,,loose,,
-cf_url,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,url,False,,100,,loose,,
-cf_json,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,json,False,,100,,loose,,
-cf_multi_object,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,multiobject,False,,100,,loose,,dcim.platform
-cf_object,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,multiobject,False,,100,,loose,,dcim.platform
+name,content_types,label,type,required,description,weight,default,filter_logic,choices,object_type,ui_visibility
+cf_boolean,"virtualization.virtualmachine,tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,ipam.vlan,ipam.service,ipam.iprange","Boolean field",boolean,False,,100,,loose,,,read-write
+cf_date,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,date,False,,100,,loose,,,read-write
+cf_integer,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,integer,False,,100,,loose,,,read-write
+cf_multi_selection,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,multiselect,False,,100,,loose,"0,1",,read-write
+cf_selection,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,select,False,,100,,loose,"0,1",,read-write
+cf_text,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,text,False,,100,,loose,,,read-write
+cf_url,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,url,False,,100,,loose,,,read-write
+cf_json,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,json,False,,100,,loose,,,read-write
+cf_multi_object,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,multiobject,False,,100,,loose,,dcim.platform,read-write
+cf_object,"tenancy.tenant,tenancy.contactrole,tenancy.contactgroup,ipam.aggregate,ipam.ipaddress,ipam.prefix,tenancy.contact,virtualization.virtualmachine,ipam.vlan,ipam.service,ipam.iprange",,multiobject,False,,100,,loose,,dcim.platform,read-write
diff --git a/examples/exports/v3.2/netbox_extras_tags.csv → examples/exports/v3.3/netbox_extras_tags.csv b/examples/exports/v3.2/netbox_extras_tags.csv → examples/exports/v3.3/netbox_extras_tags.csv
diff --git a/examples/exports/v3.2/netbox_ipam_RIRs.csv → examples/exports/v3.3/netbox_ipam_RIRs.csv b/examples/exports/v3.2/netbox_ipam_RIRs.csv → examples/exports/v3.3/netbox_ipam_RIRs.csv
diff --git a/examples/exports/v3.2/netbox_ipam_roles.csv → examples/exports/v3.3/netbox_ipam_roles.csv b/examples/exports/v3.2/netbox_ipam_roles.csv → examples/exports/v3.3/netbox_ipam_roles.csv
diff --git a/examples/exports/v3.3/netbox_virtualization_cluster types.csv b/examples/exports/v3.3/netbox_virtualization_cluster types.csv
@@ -0,0 +1,2 @@
+name,description,slug
+"Test Cluster Type","Test Cluster Type",test_cluster_type
diff --git a/examples/exports/v3.3/netbox_virtualization_clusters.csv b/examples/exports/v3.3/netbox_virtualization_clusters.csv
@@ -0,0 +1,2 @@
+name,type,status
+"Test Cluster","Test Cluster Type",active
diff --git a/examples/main.tf b/examples/main.tf
@@ -525,7 +525,7 @@ resource "netbox_ipam_ip_addresses" "dynamic_ip_from_ip_range" {
 }
 
 data "netbox_virtualization_cluster" "cluster_test" {
-  name = "test"
+  name = "Test Cluster"
 }
 
 data "netbox_dcim_platform" "platform_test" {

diff --git a/netbox/virtualization/resource_netbox_virtualization_vm_test.go b/netbox/virtualization/resource_netbox_virtualization_vm_test.go
@@ -102,7 +102,7 @@ func testAccCheckNetboxVirtualizationVMConfig(nameSuffix string, resourceFull, e
 	#	type_id = netbox_virtualization_cluster_type.test.id
 	#}
 	data "netbox_virtualization_cluster" "cluster_test" {
-		name = "test"
+		name = "Test Cluster"
 	}
 
 	{{ if eq .extraresources "true" }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		name,description,slug
		"Test Cluster Type","Test Cluster Type",test_cluster_type
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		name,type,status
		"Test Cluster","Test Cluster Type",active