Skip to content

Fixed _get_test_dump_path unable to derive nautobot version during upstream testing. #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions changes/171.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed `_get_test_dump_path` unable to derive nautobot version during upstream testing.
1 change: 1 addition & 0 deletions development/app_config_schema.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""App Config Schema Generator and Validator."""

import json
from importlib import import_module
from os import getenv
Expand Down
1 change: 1 addition & 0 deletions development/nautobot_config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Nautobot development configuration file."""

import os
import sys

Expand Down
1 change: 1 addition & 0 deletions nautobot_netbox_importer/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""App declaration for nautobot_netbox_importer."""

# Metadata is inherited from Nautobot. If not including Nautobot in the environment, this should be added
from importlib import metadata

Expand Down
1 change: 1 addition & 0 deletions nautobot_netbox_importer/command_utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Utility functions and classes for nautobot_netbox_importer."""

from io import StringIO
import pprint
import textwrap
Expand Down
1 change: 1 addition & 0 deletions nautobot_netbox_importer/diffsync/adapters/nautobot.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Nautobot Adapter for NetBox Importer."""

from nautobot_netbox_importer.generator import NautobotAdapter as _NautobotAdapter


Expand Down
1 change: 1 addition & 0 deletions nautobot_netbox_importer/diffsync/models/circuits.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""NetBox to Nautobot Circuits Models Mapping."""

from nautobot_netbox_importer.generator import SourceAdapter

from .locations import define_location
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""NetBox to Nautobot Virtualization Models Mapping."""

from nautobot_netbox_importer.generator import SourceAdapter
from nautobot_netbox_importer.generator import fields

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[
{
"model": "circuits.circuit",
"pk": "a0a8e33d-7b04-52c8-bfb2-028330b7c27c",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.311Z",
"_custom_field_data": {},
"cid": "JHEW3951",
"status": "fb37b4d1-40ae-5d11-b8cd-46d3f9c25c14",
"provider": "30efd662-fc9b-5892-b2be-adeb8091cb29",
"circuit_type": "0c9d650f-39cd-5060-809c-8cbc291e9fbb",
"tenant": "80f6b934-9627-5da1-9928-fc0e5e03f2f0",
"install_date": null,
"commit_rate": null,
"description": "",
"comments": "",
"circuit_termination_a": "52d3e1b3-be3a-5fb0-88cb-6b537325402a",
"circuit_termination_z": "2538071e-55fb-5df3-8cd7-8c3cf230882a"
}
},
{
"model": "circuits.circuit",
"pk": "e558d397-72b2-568f-9470-e7d41f8a8c70",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.326Z",
"_custom_field_data": {},
"cid": "KDPO0597",
"status": "fb37b4d1-40ae-5d11-b8cd-46d3f9c25c14",
"provider": "30efd662-fc9b-5892-b2be-adeb8091cb29",
"circuit_type": "0c9d650f-39cd-5060-809c-8cbc291e9fbb",
"tenant": "80f6b934-9627-5da1-9928-fc0e5e03f2f0",
"install_date": null,
"commit_rate": null,
"description": "",
"comments": "",
"circuit_termination_a": "8f43033b-d845-54fc-a786-507fa2c7da45",
"circuit_termination_z": "c3c0ac7b-187a-5363-924d-11428ba026c1"
}
},
{
"model": "circuits.circuit",
"pk": "ec546139-9a55-5bb5-b939-aab775339e92",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.364Z",
"_custom_field_data": {},
"cid": "PPJQ5091",
"status": "fb37b4d1-40ae-5d11-b8cd-46d3f9c25c14",
"provider": "30efd662-fc9b-5892-b2be-adeb8091cb29",
"circuit_type": "0c9d650f-39cd-5060-809c-8cbc291e9fbb",
"tenant": "80f6b934-9627-5da1-9928-fc0e5e03f2f0",
"install_date": null,
"commit_rate": null,
"description": "",
"comments": "",
"circuit_termination_a": "9b657ab6-9fba-55a8-9df2-2253c6f198e0",
"circuit_termination_z": "127e0d2d-2162-5709-8cd7-07f68916ab05"
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[
{
"model": "circuits.circuittermination",
"pk": "913ad25c-96c3-5e48-9a8a-62ec9ee64dc5",
"fields": {
"created": "2021-04-14T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.235Z",
"_custom_field_data": {},
"cable": "ba5539a9-9687-5da3-a03b-ff9c61f85613",
"_cable_peer_type": null,
"_cable_peer_id": null,
"_path": "86a7b169-2233-446e-9c09-e77921ce9327",
"circuit": "0311adae-2b75-5357-8884-5a1b427ee4a2",
"term_side": "Z",
"location": "142cf7ab-8551-5911-97b1-b5f18dd7ae6a",
"provider_network": null,
"port_speed": null,
"upstream_speed": null,
"xconnect_id": "",
"pp_info": "",
"description": ""
}
},
{
"model": "circuits.circuittermination",
"pk": "9b657ab6-9fba-55a8-9df2-2253c6f198e0",
"fields": {
"created": "2021-04-19T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.363Z",
"_custom_field_data": {},
"cable": null,
"_cable_peer_type": null,
"_cable_peer_id": null,
"_path": null,
"circuit": "ec546139-9a55-5bb5-b939-aab775339e92",
"term_side": "A",
"location": null,
"provider_network": "389a055c-b2b4-5f38-a48c-df1bc2f42fb9",
"port_speed": null,
"upstream_speed": null,
"xconnect_id": "",
"pp_info": "",
"description": ""
}
},
{
"model": "circuits.circuittermination",
"pk": "c201bbbc-ef3f-521f-ab50-77005c5547cb",
"fields": {
"created": "2021-04-14T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.208Z",
"_custom_field_data": {},
"cable": "74326f5c-e8e3-5274-a04b-c54f9b3c9442",
"_cable_peer_type": null,
"_cable_peer_id": null,
"_path": "45452c99-5206-4282-9561-33c787a60585",
"circuit": "fd74b33d-6abb-50f1-8daf-13d949bdce61",
"term_side": "Z",
"location": "2b612509-6a87-585d-8ef9-c553604b6638",
"provider_network": null,
"port_speed": null,
"upstream_speed": null,
"xconnect_id": "",
"pp_info": "",
"description": ""
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[
{
"model": "circuits.circuittype",
"pk": "0c9d650f-39cd-5060-809c-8cbc291e9fbb",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.384Z",
"_custom_field_data": {},
"name": "MPLS",
"description": ""
}
},
{
"model": "circuits.circuittype",
"pk": "77b0ea76-dd49-526f-9e5b-7526b5abaa3d",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.382Z",
"_custom_field_data": {},
"name": "Internet Access",
"description": ""
}
},
{
"model": "circuits.circuittype",
"pk": "8ce04a4e-277b-5699-964b-38ba765b7a1d",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.385Z",
"_custom_field_data": {},
"name": "Point-to-point",
"description": ""
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"model": "circuits.provider",
"pk": "259e85ef-c01a-5e32-9be4-bc9e51e66949",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.396Z",
"_custom_field_data": {},
"name": "NTT",
"asn": null,
"account": "",
"portal_url": "",
"noc_contact": "",
"admin_contact": "",
"comments": ""
}
},
{
"model": "circuits.provider",
"pk": "26f37428-e26a-5e09-8b52-664df6624a2c",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.391Z",
"_custom_field_data": {},
"name": "Comcast",
"asn": null,
"account": "",
"portal_url": "",
"noc_contact": "",
"admin_contact": "",
"comments": ""
}
},
{
"model": "circuits.provider",
"pk": "aaa90236-9b2a-5ae3-901d-59574a1d3da0",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.388Z",
"_custom_field_data": {},
"name": "AT&T",
"asn": null,
"account": "",
"portal_url": "",
"noc_contact": "",
"admin_contact": "",
"comments": ""
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"model": "circuits.providernetwork",
"pk": "389a055c-b2b4-5f38-a48c-df1bc2f42fb9",
"fields": {
"created": "2021-04-19T00:00:00Z",
"last_updated": "2024-01-02T12:01:16.402Z",
"_custom_field_data": {},
"name": "Level3 MPLS",
"provider": "30efd662-fc9b-5892-b2be-adeb8091cb29",
"description": "",
"comments": ""
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[
{
"model": "dcim.cable",
"pk": "57c17dc2-c7d2-5cf9-a52e-ab1b05462e74",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:30.666Z",
"_custom_field_data": {},
"termination_a_type": 30,
"termination_a_id": "90468568-8b0e-5a3c-b4e7-919fab2598a0",
"termination_b_type": 31,
"termination_b_id": "ad19207f-59d4-52fb-b05d-a612358922dc",
"type": "",
"status": "e81c76fa-2fb5-54e3-acbd-f0b817639af5",
"label": "",
"color": "000000",
"length": null,
"length_unit": "",
"_abs_length": null,
"_termination_a_device": "bd275898-8673-5a42-9093-454f605b2f25",
"_termination_b_device": "aa3bbef2-516c-555c-8783-c7f40f7b28d2"
}
},
{
"model": "dcim.cable",
"pk": "74326f5c-e8e3-5274-a04b-c54f9b3c9442",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:29.426Z",
"_custom_field_data": {},
"termination_a_type": 27,
"termination_a_id": "c201bbbc-ef3f-521f-ab50-77005c5547cb",
"termination_b_type": 32,
"termination_b_id": "982fc1b9-dacd-5f06-8e4a-4a3e5bcc3a99",
"type": "cat5e",
"status": "e81c76fa-2fb5-54e3-acbd-f0b817639af5",
"label": "",
"color": "2196f3",
"length": null,
"length_unit": "",
"_abs_length": null,
"_termination_a_device": null,
"_termination_b_device": "2e9b2c1d-7a16-5c4e-ab12-a5b1cd679b1c"
}
},
{
"model": "dcim.cable",
"pk": "9a3a0fae-0576-5085-99e3-4d2c958ba368",
"fields": {
"created": "2020-12-30T00:00:00Z",
"last_updated": "2024-01-02T12:01:29.138Z",
"_custom_field_data": {},
"termination_a_type": 27,
"termination_a_id": "86a8df03-c441-5af8-9566-5b44bec1b4b9",
"termination_b_type": 32,
"termination_b_id": "17761db2-5988-54f7-8285-8908a13e7ada",
"type": "smf",
"status": "e81c76fa-2fb5-54e3-acbd-f0b817639af5",
"label": "",
"color": "ffeb3b",
"length": null,
"length_unit": "",
"_abs_length": null,
"_termination_a_device": null,
"_termination_b_device": "77d715d2-761e-5a81-b80e-494174a6312f"
}
}
]
Loading
Loading