Merge pull request #499 from jestabro/config_source

T2707: allow alternative initialization data for config

config: T2707: use ConfigSource and refactor Config methods
load-config: subclass ConfigSourceSession instead of Config
http-api: remove unneeded check for VyOSError
config: T2707: add ConfigSource classes for alternative init data

1 files changed, 3 insertions, 3 deletions

diff --git a/src/helpers/vyos-load-config.py b/src/helpers/vyos-load-config.py
index a9fa15778..c2da1bb11 100755
--- a/src/helpers/vyos-load-config.py
+++ b/src/helpers/vyos-load-config.py
@@ -27,12 +27,12 @@ import sys
 import tempfile
 import vyos.defaults
 import vyos.remote
-from vyos.config import Config, VyOSError
+from vyos.configsource import ConfigSourceSession, VyOSError
 from vyos.migrator import Migrator, VirtualMigrator, MigratorError
 
-class LoadConfig(Config):
+class LoadConfig(ConfigSourceSession):
     """A subclass for calling 'loadFile'.
-    This does not belong in config.py, and only has a single caller.
+    This does not belong in configsource.py, and only has a single caller.
     """
     def load_config(self, path):
         return self._run(['/bin/cli-shell-api','loadFile',path])