From ac7c868dcba4dd6738eb0087c4f414b92bf10c9d Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Mon, 7 Jan 2019 13:05:19 -0800
Subject: Fix: T1168 - Upgrade: 1,1,7 -> 1.2.0-epa2 (command conversion)

---
 debian/changelog                          |  7 +++++++
 src/migration-scripts/ipsec/4-to-5        | 33 +++++++++++++++++++++++++++++++
 src/migration-scripts/pppoe-server/0-to-1 |  4 +++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100755 src/migration-scripts/ipsec/4-to-5

diff --git a/debian/changelog b/debian/changelog
index 4cdedf9f5..783080a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyos-1x (1.2.0-9) unstable; urgency=low
+
+  * T1168: Upgrade: 1,1,7 -> 1.2.0-epa2
+    - keyword change in config
+
+ -- hagbard <vyosdev@derith.de>  Mon, 07 Jan 2019 11:42:49 -0800
+
 vyos-1x (1.2.0-8) unstable; urgency=low
 
   * T1162: WireGuard: Unable to modify tunnels - KeyError: 'state'
diff --git a/src/migration-scripts/ipsec/4-to-5 b/src/migration-scripts/ipsec/4-to-5
new file mode 100755
index 000000000..b64aa8462
--- /dev/null
+++ b/src/migration-scripts/ipsec/4-to-5
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+# log-modes have changed, keyword  all to any
+
+import sys
+
+from vyos.configtree import ConfigTree
+
+if (len(sys.argv) < 1):
+    print("Must specify file name!")
+    sys.exit(1)
+
+file_name = sys.argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+ctree = ConfigTree(config_file)
+
+if not ctree.exists(['vpn', 'ipsec', 'logging','log-modes']):
+    # Nothing to do
+    sys.exit(0)
+else:
+  lmodes = ctree.return_values(['vpn', 'ipsec', 'logging','log-modes'])
+  for mode in lmodes:
+    if mode == 'all':
+      ctree.set(['vpn', 'ipsec', 'logging','log-modes'], value='any', replace=True)
+
+  try:
+    open(file_name,'w').write(ctree.to_string())
+  except OSError as e:
+    print("Failed to save the modified config: {}".format(e))
+    sys.exit(1)
diff --git a/src/migration-scripts/pppoe-server/0-to-1 b/src/migration-scripts/pppoe-server/0-to-1
index df816a321..bb24211b6 100755
--- a/src/migration-scripts/pppoe-server/0-to-1
+++ b/src/migration-scripts/pppoe-server/0-to-1
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
-# Delete "service ssh allow-root" option
+# Convert "service pppoe-server authentication radius-server  node key"
+# to:
+# "service pppoe-server authentication radius-server node secret"  
 
 import sys
 
-- 
cgit v1.2.3