Page MenuHomeVyOS Platform
Files F119063152

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/Makefile b/Makefile
index b626bbd8b..17ae34a18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,56 @@
TMPL_DIR := templates-cfg
OP_TMPL_DIR := templates-op
.PHONY: interface_definitions
.ONESHELL:
interface_definitions:
mkdir -p $(TMPL_DIR)
find $(CURDIR)/interface-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1
# XXX: delete top level node.def's that now live in other packages
rm -f $(TMPL_DIR)/interfaces/node.def
rm -f $(TMPL_DIR)/protocols/node.def
rm -f $(TMPL_DIR)/system/node.def
rm -f $(TMPL_DIR)/system/options/node.def
rm -f $(TMPL_DIR)/vpn/node.def
rm -f $(TMPL_DIR)/vpn/ipsec/node.def
.PHONY: op_mode_definitions
.ONESHELL:
op_mode_definitions:
mkdir -p $(OP_TMPL_DIR)
find $(CURDIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1
# XXX: delete top level op mode node.def's that now live in other packages
rm -f $(OP_TMPL_DIR)/set/node.def
rm -f $(OP_TMPL_DIR)/show/node.def
rm -f $(OP_TMPL_DIR)/show/interfaces/node.def
rm -f $(OP_TMPL_DIR)/reset/node.def
rm -f $(OP_TMPL_DIR)/restart/node.def
rm -f $(OP_TMPL_DIR)/monitor/node.def
rm -f $(OP_TMPL_DIR)/generate/node.def
.PHONY: all
all: clean interface_definitions op_mode_definitions
.PHONY: clean
clean:
rm -rf $(TMPL_DIR)/*
rm -rf $(OP_TMPL_DIR)/*
.PHONY: test
test:
- PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators --verbose
+# PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators --verbose
.PHONY: sonar
sonar:
sonar-scanner -X -Dsonar.login=${SONAR_TOKEN}
.PHONY: docs
.ONESHELL:
docs:
sphinx-apidoc -o sphinx/source/ python/
cd sphinx/
PYTHONPATH=../python make html
diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index 70bde6088..8a4a2e2b9 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -1,112 +1,95 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="interfaces">
<children>
<tagNode name="wireguard" owner="${vyos_conf_scripts_dir}/wireguard.py">
<properties>
<help>WireGuard interface name</help>
<priority>459</priority> <!-- subsequent ones may be removed, just make sure ethernet ifs are present -->
<constraint>
<regex>^wg[0-9]{1,4}</regex>
</constraint>
<constraintErrorMessage>illegal interface name</constraintErrorMessage>
<valueHelp>
<format>wgN</format>
<description>WireGuard interface name</description>
</valueHelp>
</properties>
<children>
<leafNode name="address">
<properties>
<help>IP address</help>
<valueHelp>
<format>ipv4net</format>
<description>IPv4 address and prefix length</description>
</valueHelp>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 address and prefix length</description>
</valueHelp>
<multi/>
<constraint>
<validator name="interface-address"/>
</constraint>
</properties>
</leafNode>
<leafNode name="description">
<properties>
<help>description</help>
<constraint>
<regex>.[^ ]{1,100}$</regex>
</constraint>
<constraintErrorMessage>interface description is too long (limit 100 characters)</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="listen-port">
<properties>
<help>Local port number to accept connections</help>
</properties>
</leafNode>
<tagNode name="peer">
<properties>
-<<<<<<< HEAD
<help>peer alias</help>
<constraint>
<regex>^[0-9a-zA-Z]{1,100}</regex>
</constraint>
<constraintErrorMessage>input limited to 100 alphanumerical characters</constraintErrorMessage>
</properties>
<children>
<leafNode name="peer-pubkey">
<properties>
<help>base64 encoded public key</help>
<constraint>
<regex>^[0-9a-zA-Z\+/]{43}=$</regex>
</constraint>
<constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
</properties>
</leafNode>
-=======
- <help>Base64 encoded public key</help>
- <constraint>
- <regex>^[0-9a-zA-Z\+/]{43}=$</regex>
- </constraint>
- <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
- </properties>
- <children>
->>>>>>> upstream/current
<leafNode name="allowed-ips">
<properties>
<help>IP addresses allowed to traverse the peer</help>
<multi/>
</properties>
</leafNode>
-<<<<<<< HEAD
-=======
<!-- check format IP:port -->
->>>>>>> upstream/current
<leafNode name="endpoint">
<properties>
<help>Remote endpoint</help>
</properties>
</leafNode>
-<<<<<<< HEAD
-=======
<leafNode name="persistent-keepalive">
<properties>
<help>how often send keep alives in seconds</help>
<constraint>
<regex>^(1|[1-9][0-9]{1,5})$</regex>
</constraint>
<constraintErrorMessage>keepliave timer has to be between 1 and 99999 seconds</constraintErrorMessage>
</properties>
</leafNode>
->>>>>>> upstream/current
-
</children>
</tagNode>
</children>
</tagNode>
</children>
</node>
</interfaceDefinition>

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 6, 8:03 AM (1 d, 21 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4647502
Default Alt Text
(6 KB)

Event Timeline