Skip to content
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

Accept Hostname or IPv4 Address #6

Merged
merged 1 commit into from
Oct 2, 2023
Merged

Accept Hostname or IPv4 Address #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions proteuscmd/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

from functools import wraps
from proteuscmd.config import proteus_from_config

__views = click.Choice(('intern', 'extern', 'all'), case_sensitive=False)
__ip_states = click.Choice(('STATIC', 'DHCP_RESERVED'), case_sensitive=False)
from proteuscmd.types import IPV4_TYPE, IP_STATE_TYPE, VIEW_TYPE


def with_proteus(f):
Expand Down Expand Up @@ -40,7 +38,7 @@ def ip():


@dns.command(name='get')
@click.option('--view', default='all', type=__views)
@click.option('--view', default='all', type=VIEW_TYPE)
@click.argument('domain')
@with_proteus
def dns_get(proteus, view, domain):
Expand All @@ -51,9 +49,9 @@ def dns_get(proteus, view, domain):


@dns.command(name='set')
@click.option('--view', default='all', type=__views)
@click.option('--view', default='all', type=VIEW_TYPE)
@click.argument('domain')
@click.argument('target')
@click.argument('target', type=IPV4_TYPE)
@with_proteus
def dns_set(proteus, view, domain, target):
'''Set DNS record in Proteus
Expand All @@ -67,7 +65,7 @@ def dns_set(proteus, view, domain, target):


@dns.command(name='delete')
@click.option('--view', default='all', type=__views)
@click.option('--view', default='all', type=VIEW_TYPE)
@click.argument('domain')
@with_proteus
def dns_delete(proteus, view, domain):
Expand All @@ -79,7 +77,7 @@ def dns_delete(proteus, view, domain):


@ip.command(name='get')
@click.argument('ip')
@click.argument('ip', type=IPV4_TYPE)
@with_proteus
def ip_get(proteus, ip):
'''Get information about IPv4 address
Expand All @@ -98,12 +96,12 @@ def ip_get(proteus, ip):
@click.option('--admin-name', '-n', required=True)
@click.option('--admin-phone', '-p', required=True)
@click.option('--comment', '-c')
@click.option('--state', '-s', default='DHCP_RESERVED', type=__ip_states)
@click.option('--state', '-s', default='DHCP_RESERVED', type=IP_STATE_TYPE)
@click.option('--hostname', '-h')
@click.option('--view', default='all', type=__views)
@click.option('--view', default='all', type=VIEW_TYPE)
@click.option('--prop', default=[], multiple=True)
@click.option('--force/--no-force', default=False, type=bool)
@click.argument('ip')
@click.argument('ip', type=IPV4_TYPE)
@click.argument('mac')
@with_proteus
def ip_set(proteus, admin_email, admin_name, admin_phone, comment, state,
Expand Down Expand Up @@ -138,7 +136,7 @@ def ip_set(proteus, admin_email, admin_name, admin_phone, comment, state,


@ip.command(name='delete')
@click.argument('ip')
@click.argument('ip', type=IPV4_TYPE)
@with_proteus
def ip_delete(proteus, ip):
'''Delete assigned IPv4 address
Expand Down
31 changes: 31 additions & 0 deletions proteuscmd/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import click
import ipaddress
import socket


class IPv4Type(click.ParamType):
'''Click parameter type for IPv4 address.
Also accepts domain names if they can be resolved to an IPv4 address.
'''
name = 'IPv4 address'

def convert(self, value, param, ctx):
try:
ipaddress.IPv4Address(value)
return value
except ipaddress.AddressValueError:
pass

try:
return socket.gethostbyname(value)
except socket.gaierror:
pass

self.fail(f'{value!r} cannot be resolved to IPv4 address', param, ctx)


IPV4_TYPE = IPv4Type()

VIEW_TYPE = click.Choice(('intern', 'extern', 'all'), case_sensitive=False)

IP_STATE_TYPE = click.Choice(('STATIC', 'DHCP_RESERVED'), case_sensitive=False)
Loading