From a8469895694f1f5e44484e59e2504a249cc09917 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 16 Jul 2022 18:11:54 +0200
Subject: [PATCH] Fixed: [Schema Ambiguity Error with openconfig-system re:
 NTP](https://github.com/clicon/clixon/issues/334)

---
 .github/workflows/ci.yml |  4 ++--
 CHANGELOG.md             | 11 +++++------
 apps/cli/cli_main.c      | 13 +++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a9bd2fc..12bfbff5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Clixon CI
 
 on:
   push:
-    branches: [ master, snmp ]
+    branches: [ master, callhome ]
   pull_request:
-    branches: [ master, snmp ]
+    branches: [ master, callhome ]
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0f1dc05..2ebbe998 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,10 @@
 * [3.3.2](#332) Aug 27 2017
 * [3.3.1](#331) June 7 2017
 
-## SNMP branch
+## 5.8.0
+Planned: July 2022
+
+### New features
 
 * Clixon SNMP frontend
   * Support of SNMP for retreiving and setting values via net-snmp using a MIB-YANG mapping defined in RFC6643.
@@ -49,11 +52,6 @@
     * `--with-mib-generated-yang-dir=DIR`
   * Thanks to Siklu Communications LTD for sponsoring this work
 
-## 5.8.0
-Planned: July 2022
-
-### New features
-
 * YANG Action (RFC 7950 Section 7.15)
   * Register action callback with `action_callback_register()`, see main example
   * Remains: check list keys, validate output
@@ -124,6 +122,7 @@ Developers may need to change their code
 
 ### Corrected Bugs
 
+* Fixed: [Schema Ambiguity Error with openconfig-system re: NTP](https://github.com/clicon/clixon/issues/334)
 * Fixed: [YANG mandatory statements within case nodes do not work](https://github.com/clicon/clixon/issues/344)
 * Fixed: [Nested YANG choice does not work](https://github.com/clicon/clixon/issues/342)
 * Fixed: [YANG if-feature does not support nested boolean expression](https://github.com/clicon/clixon/issues/341)
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index 17f6fb8f..6a7a035f 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -781,13 +781,14 @@ main(int    argc,
     /* Join rest of argv to a single command */
     restarg = clicon_strjoin(argc, argv, " ");
 
-    /* If several cligen object variables match same preference, select first 
-     * There is some unclarities if this should be set to 0 or 1.
-     * By default in CLIgen, it is 0
-     * It used to be 1 in Clixon. But see eg https://github.com/clicon/clixon/issues/330
-     * There may be cases where there will be "ambiguous".
+    /* Clixon hardcodes variable tie-breaks to non-terminals (2)
+     * There are cases in the autocli such as: 
+     *    (<string regexp:"r1" | <string regexp:"r2"){ ... }
+     *  where r1 and r2 are regexps that overlap.
+     * Alterntaive is to add "preference" keyword in the CLIgen syntax that overrides this.
+     * Note there may be terminal tiebreaks liuke this which would motivate a setting to "3"?
      */
-    cligen_preference_mode_set(cli_cligen(h), 0);
+    cligen_preference_mode_set(cli_cligen(h), 2);
 
     /* Call start function in all plugins before we go interactive 
      */