userspace/tools: add read VLAN configuration from dot-config in wrs_vlans

Changes: --add "--file|-f" parameter to read VLAN configuration from dot-config --"--debug" can take parameter --print VLAN configuration to be applied if debug enabled Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/tools: add read VLAN configuration from dot-config in wrs_vlans
Changes: --add "--file|-f" parameter to read VLAN configuration from dot-config --"--debug" can take parameter --print VLAN configuration to be applied if debug enabled Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
f86b16d8 · Adam Wujek · 474fe4bf · f86b16d8 · f86b16d8 · f86b16d8
Commit f86b16d8 authored Aug 18, 2016 by Adam Wujek 💬
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 525 additions and 122 deletions

wrs-user-manual.in doc/wrs-user-manual.in +7 -2

wrs_vlans.c userspace/tools/wrs_vlans.c +492 -120

wrs_vlans.h userspace/tools/wrs_vlans.h +26 -0

No files found.
--- a/doc/wrs-user-manual.in
+++ b/doc/wrs-user-manual.in
@@ -1409,8 +1409,13 @@ The following option flags are supported:
 @node wrs_vlans
 @section wrs_vlans

-The @i{wrs_vlans} shell tool can be used to setup VLANs in the switch. The
-configuration is divided into two parts:
+The @i{wrs_vlans} shell tool can be used to setup VLANs in the switch.
+The configuration can be read from the @t{dot-config} file pointed by @t{-f} or
+@t{--file} parameter (for @t{dot-config} details please check the
+@ref{Configuration Items that Apply at Build Time})
+Additionally the configuration can be specified using parameters below.
+
+The configuration is divided into two parts:

 @table @code


--- a/userspace/tools/wrs_vlans.c
+++ b/userspace/tools/wrs_vlans.c
--- a/userspace/tools/wrs_vlans.h
+++ b/userspace/tools/wrs_vlans.h
@@ -58,6 +58,32 @@
 #define OPT_RTU_DROP  23
 #define OPT_RTU_PRIO  24
 #define OPT_RTU_DEL   25
+#define OPT_FILE_READ 'f'
+
+#define PORT_PRIO_MIN 0
+#define PORT_PRIO_MAX 7
+
+#define PORT_VID_MIN 0
+#define PORT_VID_MAX 4095
+
+#define RTU_VID_MIN 0
+#define RTU_VID_MAX 4095
+
+#define RTU_FID_MIN 0
+#define RTU_FID_MAX 4095
+
+#define RTU_PRIO_MIN 0
+#define RTU_PRIO_MAX 7
+
+#define RTU_PMASK_MIN 0
+#define RTU_PMASK_MAX ((1 << NPORTS) - 1)
+
+/* struct for ranges of VLAN sets used in dot-config */
+struct vlan_sets {
+	char *name;
+	int min;
+	int max;
+};

 struct s_port_vlans
 {