lint fixes

This commit is contained in:
ryanmerolle 2023-01-21 22:36:40 -05:00
parent 0c53a2bb06
commit fd449a12d9
55 changed files with 132 additions and 85 deletions

View File

@ -25,11 +25,12 @@
// "source.organizeImports": true
// }
//},
"python.sortImports.args": [
"isort.args": [
"--profile=black"
],
"python.sortImports.path": "/opt/netbox/venv/bin/isort",
"isort.path": "/opt/netbox/venv/bin/isort",
"python.analysis.typeCheckingMode": "strict",
python.Jedi
"python.analysis.extraPaths": [
"/opt/netbox/netbox"
],

View File

@ -1,3 +1,4 @@
---
version: '3.4'
services:
netbox:

View File

@ -1,3 +1,4 @@
---
version: '3.4'
services:
netbox: &netbox

View File

@ -1,3 +1,4 @@
---
- prefix: 10.0.0.0/16
rir: RFC1918
tenant: tenant1

View File

@ -1,3 +1,4 @@
---
- asn: 1
rir: RFC1918
tenant: tenant1

View File

@ -1,3 +1,4 @@
---
# Required parameters for termination X ('a' or 'b'):
#
# ```

View File

@ -1,3 +1,4 @@
---
- name: VPLS
slug: vpls
- name: MPLS

View File

@ -1,3 +1,4 @@
---
- cid: Circuit_ID-1
provider: Provider1
type: Internet

View File

@ -1,3 +1,4 @@
---
- name: Group 1
slug: group-1
- name: Group 2

View File

@ -1,2 +1,3 @@
---
- name: Hyper-V
slug: hyper-v

View File

@ -1,3 +1,4 @@
---
- name: cluster1
type: Hyper-V
group: Group 1

View File

@ -1,3 +1,4 @@
---
- name: Network-Team
slug: network-team
description: This is a new contact group for the Network-Team

View File

@ -1,3 +1,4 @@
---
- name: New Contact Role
slug: new-contact-role
description: This is a new contact role description

View File

@ -1,3 +1,4 @@
---
- name: Lee Widget
title: CEO of Widget Corp
phone: 221-555-1212

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## type:
## - text

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## new_window:
## - True

View File

@ -1,3 +1,4 @@
---
- name: switch
slug: switch
color: Grey

View File

@ -1,3 +1,4 @@
---
- model: Model 1
manufacturer: Manufacturer 1
slug: model-1

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## face:
## - front

View File

@ -1,3 +1,4 @@
---
applications:
users:
- technical_user

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## type:
## - virtual

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## status:
## - active

View File

@ -1,3 +1,4 @@
---
- name: cage 101
slug: cage-101
site: SING 1

View File

@ -1,3 +1,4 @@
---
- name: Manufacturer 1
slug: manufacturer-1
- name: Manufacturer 2

View File

@ -1,3 +1,4 @@
---
all.ro:
actions:
- view

View File

@ -1,3 +1,4 @@
---
- name: Platform 1
slug: platform-1
manufacturer: Manufacturer 1

View File

@ -1,3 +1,4 @@
---
- name: power feed 1
power_panel: power panel AMS 1
voltage: 208

View File

@ -1,3 +1,4 @@
---
- name: power panel AMS 1
site: AMS 1
- name: power panel SING 1

View File

@ -1,2 +1,3 @@
---
- name: Main Management
slug: main-management

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## status:
## - container

View File

@ -1,3 +1,4 @@
---
- name: Provider1
slug: provider1
asn: 121

View File

@ -1,3 +1,4 @@
---
- name: Role 1
slug: role-1
color: Pink

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## width:
## - 19

View File

@ -1,3 +1,4 @@
---
- name: Singapore
slug: singapore
- name: Amsterdam

View File

@ -1,3 +1,4 @@
---
- is_private: true
name: RFC1918
slug: rfc1918

View File

@ -1,3 +1,4 @@
---
- name: 65000:1001
tenant: tenant1
- name: 65000:1002

View File

@ -1,3 +1,4 @@
---
- name: DNS
protocol: TCP
ports:

View File

@ -1,3 +1,4 @@
---
- name: AMS 1
slug: ams1
region: Downtown

View File

@ -1,3 +1,4 @@
---
- name: Tag 1
slug: tag-1
color: Pink

View File

@ -1,3 +1,4 @@
---
- name: Tenant Group 1
slug: tenant-group-1
- name: Tenant Group 2

View File

@ -1,3 +1,4 @@
---
- name: tenant1
slug: tenant1
- name: tenant2

View File

@ -1,3 +1,4 @@
---
technical_user:
api_token: "" # a token is generated automatically unless the value is explicity set to empty
reader:

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## status:
## - active

View File

@ -1,3 +1,4 @@
---
- description: Network Interface 1
enabled: true
mac_address: 00:77:77:77:77:77

View File

@ -1,3 +1,4 @@
---
- name: VLAN group 1
scope_type: dcim.region
scope: Amsterdam

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## status:
## - active

View File

@ -1,3 +1,4 @@
---
- enforce_unique: true
name: vrf1
tenant: tenant1

View File

@ -1,3 +1,4 @@
---
## Possible Choices:
## object_types:
## - device

View File

@ -14,10 +14,10 @@ name: "CodeQL"
on:
push:
branches: [ "dev" ]
branches: ["dev"]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "dev" ]
branches: ["dev"]
schedule:
- cron: '24 4 * * 5'
@ -33,8 +33,8 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
language: ['python']
# CodeQL supports ['cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby']
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
steps:

View File

@ -9,9 +9,9 @@ name: Lint Code Base
on:
push:
branches: [ "dev" ]
branches: ["dev"]
pull_request:
branches: [ "dev" ]
branches: ["dev"]
jobs:
run-lint:
runs-on: ubuntu-latest

View File

@ -37,15 +37,11 @@ repos:
hooks:
- id: pyupgrade
args:
- "--py37-plus"
#- repo: https://github.com/adrienverge/yamllint
# rev: v1.26.3
# hooks:
# - id: yamllint
- repo: https://github.com/psf/black
rev: 22.12.0
- "--py39-plus"
- repo: https://github.com/adrienverge/yamllint
rev: v1.29.0
hooks:
- id: black
- id: yamllint
#- repo: https://github.com/Lucas-C/pre-commit-hooks-nodejs
# rev: v1.1.2
# hooks:

View File

@ -27,8 +27,8 @@ This project just looks to build on top of this framework and model presented.
This project is currently maintained jointly by:
* [Abhimanyu Saharan](https://github.com/abhi1693)
* [Ryan Merolle](https://github.com/ryanmerolle)
- [Abhimanyu Saharan](https://github.com/abhi1693)
- [Ryan Merolle](https://github.com/ryanmerolle)
See the [CONTRIBUTING](CONTRIBUTING.md) for more information.

View File

@ -64,10 +64,11 @@ class Migration(migrations.Migration):
models.Q(("app_label", "dcim"), ("model", "device")),
models.Q(("app_label", "dcim"), ("model", "virtualchassis")),
models.Q(
("app_label", "virtualization"), ("model", "virtualmachine")
("app_label", "virtualization"),
("model", "virtualmachine"),
),
_connector="OR",
)
),
),
on_delete=django.db.models.deletion.PROTECT,
to="contenttypes.contenttype",
@ -82,7 +83,7 @@ class Migration(migrations.Migration):
django.core.validators.RegexValidator(
"^[0-9a-zA-Z,-,_]*$",
"Only alphanumeric, hyphens, and underscores characters are allowed.",
)
),
],
),
),
@ -111,7 +112,8 @@ class Migration(migrations.Migration):
model_name="aclinterfaceassignment",
name="access_list",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="netbox_acls.accesslist"
on_delete=django.db.models.deletion.CASCADE,
to="netbox_acls.accesslist",
),
),
migrations.AlterField(
@ -127,10 +129,11 @@ class Migration(migrations.Migration):
models.Q(
models.Q(("app_label", "dcim"), ("model", "interface")),
models.Q(
("app_label", "virtualization"), ("model", "vminterface")
("app_label", "virtualization"),
("model", "vminterface"),
),
_connector="OR",
)
),
),
on_delete=django.db.models.deletion.PROTECT,
to="contenttypes.contenttype",