diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/completion/list_interfaces.py | 4 | ||||
-rwxr-xr-x | src/conf_mode/dynamic_dns.py | 10 | ||||
-rwxr-xr-x | src/services/vyos-http-api-server | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/completion/list_interfaces.py b/src/completion/list_interfaces.py index 84d17f89f..47eeaf00c 100755 --- a/src/completion/list_interfaces.py +++ b/src/completion/list_interfaces.py @@ -16,7 +16,7 @@ args = parser.parse_args() if args.type: try: interfaces = vyos.interfaces.list_interfaces_of_type(args.type) - + except ValueError as e: print(e, file=sys.stderr) print("") @@ -35,6 +35,8 @@ elif args.bridgeable: vxlan = vyos.interfaces.list_interfaces_of_type("vxlan") wireless = vyos.interfaces.list_interfaces_of_type("wireless") tunnel = vyos.interfaces.list_interfaces_of_type("tunnel") + wireless = vyos.interfaces.list_interfaces_of_type("wireless") + interfaces = eth + bond + l2tpv3 + openvpn + vxlan + wireless + tunnel elif args.bondable: diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py index 027a7f7e3..7c3b9ff6a 100755 --- a/src/conf_mode/dynamic_dns.py +++ b/src/conf_mode/dynamic_dns.py @@ -47,11 +47,11 @@ use=if, if={{ interface.interface }} {% for rfc in interface.rfc2136 -%} {% for record in rfc.record %} # RFC2136 dynamic DNS configuration for {{ record }}.{{ rfc.zone }} -server={{ rfc.server }}, -protocol=nsupdate, -password={{ rfc.keyfile }}, -ttl={{ rfc.ttl }}, -zone={{ rfc.zone }}, +server={{ rfc.server }} +protocol=nsupdate +password={{ rfc.keyfile }} +ttl={{ rfc.ttl }} +zone={{ rfc.zone }} {{ record }} {% endfor -%} {% endfor -%} diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server index 571ec1258..1abaed873 100755 --- a/src/services/vyos-http-api-server +++ b/src/services/vyos-http-api-server @@ -221,7 +221,7 @@ def get_value(): elif config_format == 'raw': pass else: - return error(400, "\"{0}\" is not a valid config format") + return error(400, "\"{0}\" is not a valid config format".format(config_format)) else: return error(400, "\"{0}\" is not a valid operation".format(op)) except VyOSError as e: |