From b03cc37db0ca2f28d8797b160db3199a4cd9854a Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 27 May 2016 19:46:53 +0000
Subject: [PATCH] Upgrade organization improvements.

---
 .../all/vendor-config-onl/src/bin/initmounts  |  3 --
 .../base/all/vendor-config-onl/src/bin/pki    |  3 --
 .../src/python/onl/upgrade/ubase.py           | 30 ++++---------------
 3 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100755 packages/base/all/vendor-config-onl/src/bin/initmounts
 delete mode 100755 packages/base/all/vendor-config-onl/src/bin/pki

diff --git a/packages/base/all/vendor-config-onl/src/bin/initmounts b/packages/base/all/vendor-config-onl/src/bin/initmounts
deleted file mode 100755
index a2ccaecd..00000000
--- a/packages/base/all/vendor-config-onl/src/bin/initmounts
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-from onl.mounts import OnlMountManager
-OnlMountManager.main()
diff --git a/packages/base/all/vendor-config-onl/src/bin/pki b/packages/base/all/vendor-config-onl/src/bin/pki
deleted file mode 100755
index eb5105a8..00000000
--- a/packages/base/all/vendor-config-onl/src/bin/pki
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-from onl.pki import OnlPKI
-OnlPKI.main()
diff --git a/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py b/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py
index aacffaa8..4c7784b7 100644
--- a/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py
+++ b/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py
@@ -13,6 +13,7 @@ import shutil
 import json
 import string
 import argparse
+import yaml
 from time import sleep
 from onl.platform.current import OnlPlatform
 
@@ -36,32 +37,11 @@ class BaseUpgrade(object):
         self.arch = pp.machine()
         self.parch = dict(ppc='powerpc', x86_64='amd64', armv7l='armel')[self.arch]
         self.platform = OnlPlatform()
+        self.init()
+
+    def init(self):
+        pass
 
-    #
-    # TODO.
-    #
-    # DEFAULT_CONFIG = {
-    #     "auto-upgrade" : "advisory",
-    #     }
-    #
-    # CONFIG_FILES = [
-    #     "/etc/boot.d/upgrade/.upgrade-config.json",
-    #     "/mnt/flash/override-upgrade-config.json"
-    #     ]
-    #
-    # def load_config(self):
-    #     self.config = self.DEFAULT_CONFIG
-    #     for f in self.CONFIG_FILES:
-    #         if os.path.exists(f):
-    #             self.config.update(json.load(file(f)))
-    #
-    #     self.logger.debug("Loaded Configuration:\n%s\n" % (json.dumps(self.config, indent=2)))
-    #
-    #     if self.name in self.config:
-    #         self.config = self.config['name']
-    #
-    #     self.logger.debug("Final Configuration:\n%s\n" % (json.dumps(self.config, indent=2)))
-    #
     def load_config(self):
         pass