Skip to content

Commit d7e95cd

Browse files
FragmentedPacketFragmentedPacket
authored
Bugfix: netbox_site - Changed lat/longitude from float to str (#418)
1 parent 60e9aa0 commit d7e95cd

File tree

3 files changed

+108
-12
lines changed

3 files changed

+108
-12
lines changed

‎plugins/modules/netbox_site.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@
9898
description:
9999
- Latitude in decimal format
100100
required: false
101-
type: float
101+
type: str
102102
longitude:
103103
description:
104104
- Longitude in decimal format
105105
required: false
106-
type: float
106+
type: str
107107
contact_name:
108108
description:
109109
- Name of contact for site
@@ -253,8 +253,8 @@ def main():
253253
description=dict(required=False, type="str"),
254254
physical_address=dict(required=False, type="str"),
255255
shipping_address=dict(required=False, type="str"),
256-
latitude=dict(required=False, type="float"),
257-
longitude=dict(required=False, type="float"),
256+
latitude=dict(required=False, type="str"),
257+
longitude=dict(required=False, type="str"),
258258
contact_name=dict(required=False, type="str"),
259259
contact_phone=dict(required=False, type="str"),
260260
contact_email=dict(required=False, type="str"),

‎tests/integration/targets/latest/tasks/netbox_site.yml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
description: This is a test description
7979
physical_address: Hollywood, CA, 90210
8080
shipping_address: Hollywood, CA, 90210
81-
latitude: 10.1
82-
longitude: 12.2
81+
latitude: "22.169141"
82+
longitude: "-100.994041"
8383
contact_name: Jenny
8484
contact_phone: 867-5309
8585
contact_email: jenny@changednumber.com
@@ -105,14 +105,62 @@
105105
- test_four['site']['description'] == "This is a test description"
106106
- test_four['site']['physical_address'] == "Hollywood, CA, 90210"
107107
- test_four['site']['shipping_address'] == "Hollywood, CA, 90210"
108-
- test_four['site']['latitude'] == "10.100000"
109-
- test_four['site']['longitude'] == "12.200000"
108+
- test_four['site']['latitude'] == "22.169141"
109+
- test_four['site']['longitude'] == "-100.994041"
110110
- test_four['site']['contact_name'] == "Jenny"
111111
- test_four['site']['contact_phone'] == "867-5309"
112112
- test_four['site']['contact_email'] == "jenny@changednumber.com"
113113
- test_four['site']['comments'] == "### Placeholder"
114114
- test_four['site']['slug'] == "test_california"
115115

116+
- name: "NETBOX_SITE_IDEM: Idempotency - Create duplicate site with all parameters"
117+
netbox.netbox.netbox_site:
118+
netbox_url: http://localhost:32768
119+
netbox_token: 0123456789abcdef0123456789abcdef01234567
120+
data:
121+
name: Test - California
122+
status: Planned
123+
region: Test Region
124+
tenant: Test Tenant
125+
facility: EquinoxCA7
126+
asn: 65001
127+
time_zone: America/Los Angeles
128+
description: This is a test description
129+
physical_address: Hollywood, CA, 90210
130+
shipping_address: Hollywood, CA, 90210
131+
latitude: "22.169141"
132+
longitude: "-100.994041"
133+
contact_name: Jenny
134+
contact_phone: 867-5309
135+
contact_email: jenny@changednumber.com
136+
comments: "### Placeholder"
137+
slug: "test_california"
138+
state: present
139+
register: test_results
140+
141+
- name: "NETBOX_SITE_IDEM: (ASSERT) Idempotency - Duplicate device site with all parameters"
142+
assert:
143+
that:
144+
- test_results is not changed
145+
- test_results['site']['name'] == "Test - California"
146+
- test_results['msg'] == "site Test - California already exists"
147+
- test_results['site']['status'] == "planned"
148+
- test_results['site']['region'] == 1
149+
- test_results['site']['tenant'] == 1
150+
- test_results['site']['facility'] == "EquinoxCA7"
151+
- test_results['site']['asn'] == 65001
152+
- test_results['site']['time_zone'] == "America/Los_Angeles"
153+
- test_results['site']['description'] == "This is a test description"
154+
- test_results['site']['physical_address'] == "Hollywood, CA, 90210"
155+
- test_results['site']['shipping_address'] == "Hollywood, CA, 90210"
156+
- test_results['site']['latitude'] == "22.169141"
157+
- test_results['site']['longitude'] == "-100.994041"
158+
- test_results['site']['contact_name'] == "Jenny"
159+
- test_results['site']['contact_phone'] == "867-5309"
160+
- test_results['site']['contact_email'] == "jenny@changednumber.com"
161+
- test_results['site']['comments'] == "### Placeholder"
162+
- test_results['site']['slug'] == "test_california"
163+
116164
- name: "5 - Delete site within netbox"
117165
netbox.netbox.netbox_site:
118166
netbox_url: http://localhost:32768

‎tests/integration/targets/v2.9/tasks/netbox_site.yml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
description: This is a test description
7979
physical_address: Hollywood, CA, 90210
8080
shipping_address: Hollywood, CA, 90210
81-
latitude: 10.1
82-
longitude: 12.2
81+
latitude: "22.169141"
82+
longitude: "-100.994041"
8383
contact_name: Jenny
8484
contact_phone: 867-5309
8585
contact_email: jenny@changednumber.com
@@ -105,14 +105,62 @@
105105
- test_four['site']['description'] == "This is a test description"
106106
- test_four['site']['physical_address'] == "Hollywood, CA, 90210"
107107
- test_four['site']['shipping_address'] == "Hollywood, CA, 90210"
108-
- test_four['site']['latitude'] == "10.100000"
109-
- test_four['site']['longitude'] == "12.200000"
108+
- test_four['site']['latitude'] == "22.169141"
109+
- test_four['site']['longitude'] == "-100.994041"
110110
- test_four['site']['contact_name'] == "Jenny"
111111
- test_four['site']['contact_phone'] == "867-5309"
112112
- test_four['site']['contact_email'] == "jenny@changednumber.com"
113113
- test_four['site']['comments'] == "### Placeholder"
114114
- test_four['site']['slug'] == "test_california"
115115

116+
- name: "NETBOX_SITE_IDEM: Idempotency - Create duplicate site with all parameters"
117+
netbox.netbox.netbox_site:
118+
netbox_url: http://localhost:32768
119+
netbox_token: 0123456789abcdef0123456789abcdef01234567
120+
data:
121+
name: Test - California
122+
status: Planned
123+
region: Test Region
124+
tenant: Test Tenant
125+
facility: EquinoxCA7
126+
asn: 65001
127+
time_zone: America/Los Angeles
128+
description: This is a test description
129+
physical_address: Hollywood, CA, 90210
130+
shipping_address: Hollywood, CA, 90210
131+
latitude: "22.169141"
132+
longitude: "-100.994041"
133+
contact_name: Jenny
134+
contact_phone: 867-5309
135+
contact_email: jenny@changednumber.com
136+
comments: "### Placeholder"
137+
slug: "test_california"
138+
state: present
139+
register: test_results
140+
141+
- name: "NETBOX_SITE_IDEM: (ASSERT) Idempotency - Duplicate device site with all parameters"
142+
assert:
143+
that:
144+
- test_results is not changed
145+
- test_results['site']['name'] == "Test - California"
146+
- test_results['msg'] == "site Test - California already exists"
147+
- test_results['site']['status'] == "planned"
148+
- test_results['site']['region'] == 1
149+
- test_results['site']['tenant'] == 1
150+
- test_results['site']['facility'] == "EquinoxCA7"
151+
- test_results['site']['asn'] == 65001
152+
- test_results['site']['time_zone'] == "America/Los_Angeles"
153+
- test_results['site']['description'] == "This is a test description"
154+
- test_results['site']['physical_address'] == "Hollywood, CA, 90210"
155+
- test_results['site']['shipping_address'] == "Hollywood, CA, 90210"
156+
- test_results['site']['latitude'] == "22.169141"
157+
- test_results['site']['longitude'] == "-100.994041"
158+
- test_results['site']['contact_name'] == "Jenny"
159+
- test_results['site']['contact_phone'] == "867-5309"
160+
- test_results['site']['contact_email'] == "jenny@changednumber.com"
161+
- test_results['site']['comments'] == "### Placeholder"
162+
- test_results['site']['slug'] == "test_california"
163+
116164
- name: "5 - Delete site within netbox"
117165
netbox.netbox.netbox_site:
118166
netbox_url: http://localhost:32768

0 commit comments

Comments
 (0)