Skip to content

Add CLI option for custom git URL #7

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 13, 2020
Merged

Add CLI option for custom git URL #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54907aa
Add CLI options for git URL
mtinberg Nov 12, 2020
2188ac7
Return empty deviceTypes in readYAML on error
mtinberg Nov 12, 2020
0d9773c
Add VSCode tmp files to gitignore
mtinberg Nov 12, 2020
00e9b3d
Update output messages with git remote and local path
mtinberg Nov 12, 2020
a78df75
Switch early return so readYAML can continue with other files
mtinberg Nov 12, 2020
d57b93f
Strip invalid spaces from Manufacturer slug generation
mtinberg Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,6 @@ dmypy.json

# Pyre type checker
.pyre/

# Editor
.vscode
19 changes: 9 additions & 10 deletions nb-dt-import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
import yaml, pynetbox, glob, argparse, os, settings

parser = argparse.ArgumentParser(description='Import Netbox Device Types')
parser.add_argument('--vendor', nargs='+')

parser.add_argument('--vendor', nargs='+', help="List of vendors to import eg. apc cisco")
parser.add_argument('--url','--git', default='https://github.com/netbox-community/devicetype-library.git', help="Git URL with valid Device Type YAML files")
args = parser.parse_args()

cwd = os.getcwd()
counter = Counter(added=0,updated=0,manufacturer=0)
url = 'https://github.com/netbox-community/devicetype-library.git'
nbUrl = settings.NETBOX_URL
nbToken = settings.NETBOX_TOKEN

Expand All @@ -18,7 +17,7 @@ def update_package(path: str):
repo = Repo(path)
if repo.remotes.origin.url.endswith('.git'):
repo.remotes.origin.pull()
print("Pulled Repo")
print(f"Pulled Repo {repo.remotes.origin.url}")
except exc.InvalidGitRepositoryError:
pass

Expand Down Expand Up @@ -49,10 +48,11 @@ def readYAMl(files):
data = yaml.safe_load(stream)
except yaml.YAMLError as exc:
print(exc)
continue
manufacturer = data['manufacturer']
data['manufacturer'] = {}
data['manufacturer']['name'] = manufacturer
data['manufacturer']['slug'] = manufacturer.lower()
data['manufacturer']['slug'] = manufacturer.lower().replace(" ", "")
deviceTypes.append(data)
manufacturers.append(manufacturer)
return deviceTypes
Expand Down Expand Up @@ -245,14 +245,13 @@ def createDeviceTypes(deviceTypes, nb):

try:
if os.path.isdir('./repo'):
msg = 'Package devicetype-library is already installed, updating'
print(f"Package devicetype-library is already installed, updating {os.path.join(cwd, 'repo')}")
update_package('./repo')
print(msg)
else:
repo = Repo.clone_from(url, os.path.join(cwd, 'repo'))
print("Package Installed")
repo = Repo.clone_from(args.url, os.path.join(cwd, 'repo'))
print(f"Package Installed {repo.remotes.origin.url}")
except exc.GitCommandError as error:
print("Couldn't clone {} ({})".format(url, error))
print("Couldn't clone {} ({})".format(args.url, error))

nb = pynetbox.api(nbUrl, token=nbToken)

Expand Down