map-controller: fix an issue in parsing of node config

gitlab-ci/install-dependencies.sh

@@ -47,7 +47,7 @@ exec_cmd cp wifimngr /usr/sbin/
 cd /opt/dev
 export CFLAGS="${CFLAGS} -g -Wall -g -O0 -DHAS_WIFI -DDYNAMIC_CNTLR_SYNC_CONFIG"
 rm -fr ieee1905
-exec_cmd git clone --depth 1 -b devel https://dev.iopsys.eu/iopsys/ieee1905.git
+exec_cmd git clone --depth 1 -b release-6.5 https://dev.iopsys.eu/iopsys/ieee1905.git
 cd ieee1905
 exec_cmd ./gitlab-ci/install-dependencies.sh
 exec_cmd ./gitlab-ci/setup.sh
@@ -68,7 +68,6 @@ exec_cmd cp -a extensions/map/map.so /usr/lib
 exec_cmd cp -a extensions/map/map_module.h /usr/include/
 exec_cmd cp -a extensions/map/map2.h /usr/include/
 exec_cmd cp -a extensions/map/cntlrsync.h /usr/include/
-exec_cmd cp -a extensions/map/easymesh.h /usr/include/
 
 ldconfig
 

src/config.c

@@ -1062,6 +1062,8 @@ static int cntlr_config_get_agent_node(struct controller_config *c,
 		{ .name = "backhaul_ul_macaddr", .type = UCI_TYPE_STRING },
 		{ .name = "backhaul_dl_macaddr", .type = UCI_TYPE_STRING },
 		{ .name = "backhaul_type", .type = UCI_TYPE_STRING },
+		{ .name = "primary_vid", .type = UCI_TYPE_STRING },
+		{ .name = "primary_pcp", .type = UCI_TYPE_STRING },
 		{ .name = "report_sta_assocfails", .type = UCI_TYPE_STRING },
 		{ .name = "report_sta_assocfails_rate", .type = UCI_TYPE_STRING },
 		{ .name = "report_metric_periodic", .type = UCI_TYPE_STRING },