From ae943d485e0b32bc73ceff050bad0d438bf3daae Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Thu, 15 Apr 2021 20:02:41 +0200
Subject: [PATCH] prepare for 5.1.0

---
 CHANGELOG.md                            | 2 +-
 configure                               | 2 +-
 configure.ac                            | 2 +-
 test/test_openconfig.sh                 | 5 -----
 test/test_openconfig_interfaces.sh      | 5 -----
 test/test_restconf_internal_usecases.sh | 4 ++--
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c51507a8..320d2d75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@
 ## 5.1.0
 15 April 2021
 
-This release contains more RESTCONF native mode restructuring, but also new multi-yang support in upgrade scenarios and a stricter NETCONF HELLO handling.
+The 5.1 release contains more RESTCONF native mode restructuring, new multi-yang support in upgrade scenarios and a stricter NETCONF HELLO handling, and many minor updates and bugfixes.
 
 ### New features
 
diff --git a/configure b/configure
index 303ae5b5..91196887 100755
--- a/configure
+++ b/configure
@@ -2261,7 +2261,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 CLIXON_VERSION_MAJOR="5"
 CLIXON_VERSION_MINOR="1"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
 
 # Check CLIgen
 if test "$prefix" = "NONE"; then
diff --git a/configure.ac b/configure.ac
index d3bb8acf..3df5709c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_CONFIG_AUX_DIR(config-aux)
 CLIXON_VERSION_MAJOR="5"
 CLIXON_VERSION_MINOR="1"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
 
 # Check CLIgen
 if test "$prefix" = "NONE"; then
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index d04431b0..f33f78e7 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -62,11 +62,6 @@ cat <<EOF > $cfg
   <CLICON_YANG_DIR>$OCDIR/types</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>$OCDIR/vlan</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>$OCDIR/wifi</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/access-points</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/ap-manager</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/mac</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/phy</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/types</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
diff --git a/test/test_openconfig_interfaces.sh b/test/test_openconfig_interfaces.sh
index a880f6ca..e12aeedd 100755
--- a/test/test_openconfig_interfaces.sh
+++ b/test/test_openconfig_interfaces.sh
@@ -57,11 +57,6 @@ cat <<EOF > $cfg
   <CLICON_YANG_DIR>$OCDIR/types</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>$OCDIR/vlan</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>$OCDIR/wifi</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/access-points</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/ap-manager</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/mac</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/phy</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>$OCDIR/wifi/types</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>	
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_restconf_internal_usecases.sh b/test/test_restconf_internal_usecases.sh
index fc2ab27f..fddd0cc0 100755
--- a/test/test_restconf_internal_usecases.sh
+++ b/test/test_restconf_internal_usecases.sh
@@ -328,7 +328,7 @@ if [ $pid1 -eq 0 ]; then err "Pid" 0; fi
 sleep $DEMSLEEP
 
 new "Get restconf config 1"
-expectpart "$(curl $CURLOPTS -X GET -H 'Accept: application/yang-data+xml' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf)" 0 "HTTP/1.1 200 OK" "<restconf xmlns=\"http://clicon.org/restconf\"><enable>true</enable><auth-type>none</auth-type><debug>$RESTCONFDBG</debug><pretty>false</pretty><socket><namespace>default</namespace><address>0.0.0.0</address><port>80</port><ssl>false</ssl></socket></restconf>"
+expectpart "$(curl $CURLOPTS -X GET -H 'Accept: application/yang-data+xml' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf)" 0 "HTTP/1.1 200 OK" "<restconf xmlns=\"http://clicon.org/restconf\"><enable>true</enable><auth-type>none</auth-type><debug>$RESTCONFDBG</debug><enable-core-dump>false</enable-core-dump><pretty>false</pretty><socket><namespace>default</namespace><address>0.0.0.0</address><port>80</port><ssl>false</ssl></socket></restconf>"
 
 # remove it
 new "Delete server"
@@ -422,7 +422,7 @@ if [ $pid1 -eq 0 ]; then err "Pid" 0; fi
 sleep $DEMSLEEP
 
 new "Get restconf config"
-expectpart "$(curl $CURLOPTS -X GET -H 'Accept: application/yang-data+xml' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf)" 0 "HTTP/1.1 200 OK" "<restconf xmlns=\"http://clicon.org/restconf\"><enable>true</enable><auth-type>none</auth-type><debug>$RESTCONFDBG</debug><pretty>false</pretty><socket><namespace>default</namespace><address>0.0.0.0</address><port>80</port><ssl>false</ssl></socket><socket><namespace>default</namespace><address>$INVALIDADDR</address><port>8080</port><ssl>false</ssl></socket></restconf>"
+expectpart "$(curl $CURLOPTS -X GET -H 'Accept: application/yang-data+xml' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf)" 0 "HTTP/1.1 200 OK" "<restconf xmlns=\"http://clicon.org/restconf\"><enable>true</enable><auth-type>none</auth-type><debug>$RESTCONFDBG</debug><enable-core-dump>false</enable-core-dump><pretty>false</pretty><socket><namespace>default</namespace><address>0.0.0.0</address><port>80</port><ssl>false</ssl></socket><socket><namespace>default</namespace><address>$INVALIDADDR</address><port>8080</port><ssl>false</ssl></socket></restconf>"
 
 if [ $BE -ne 0 ]; then
     new "Kill backend"