changing configparser get method

Author: Jainpriyal

build renamed to docker_build

@@ -1,2 +1,4 @@
 from .version import __version__
 from jnpr.jsnapy.jsnapy import SnapAdmin
+
+

lib/jnpr/jsnapy/__init__.py

@@ -27,7 +27,7 @@ def generate_snap_file(self, device, prefix, cmd_rpc_name, reply_format):
             return prefix
         else:
             file = str(device) + '_' + prefix + '_' + cmd_rpc_name + '.' + reply_format
-            snapfile = os.path.join((self.config['DEFAULT'].get('snapshot_path', '/etc/jsnapy/snapshots')).encode('utf-8'), file)
+            snapfile = os.path.join((self.config.get('DEFAULT', 'snapshot_path', vars={'snapshot_path': '/etc/jsnapy/snapshots'})).encode('utf-8'), file)
             return snapfile
 
     def get_err_mssg(self, path, ele_list):
@@ -251,7 +251,7 @@ def generate_test_files(
                 "\nNo test file, Please mention test files !!")
         else:
             for tfiles in main_file.get('tests'):
-                filename = os.path.join((self.config['DEFAULT'].get('test_file_path', '/etc/jsnapy/testfiles')).encode('utf-8'), tfiles)
+                filename = os.path.join((self.config.get('DEFAULT', 'test_file_path', vars={'test_file_path':'/etc/jsnapy/testfiles'})).encode('utf-8'), tfiles)
                 if os.path.isfile(filename):
                     testfile = open(filename, 'r')
                     tfiles = yaml.load(testfile)

lib/jnpr/jsnapy/check.py

@@ -182,8 +182,9 @@ def get_hosts(self):
         if os.path.isfile(conf_file):
             config_file = open(conf_file, 'r')
             self.main_file = yaml.load(config_file)
-        elif os.path.isfile(os.path.join((self.config['DEFAULT'].get('config_file_path','/etc/jsnapy')).encode('utf-8') , conf_file)):
-            fpath= (self.config['DEFAULT'].get('config_file_path','/etc/jsnapy')).encode('utf-8')
+
+        elif os.path.isfile(os.path.join(self.config.get('DEFAULT', 'config_file_path', vars={'config_file_path':'/etc/jsnapy'}).encode('utf-8'), conf_file)):
+            fpath= (self.config.get('DEFAULT', 'config_file_path', vars={'config_file_path':'/etc/jsnapy'})).encode('utf-8')
             config_file = open(os.path.join(fpath , conf_file), 'r')
             self.main_file = yaml.load(config_file)
         else:
@@ -271,7 +272,7 @@ def generate_rpc_reply(self, dev, output_file, hostname, username):
         test_files = []
         for tfile in self.main_file['tests']:
             if not os.path.isfile(tfile):
-                tfile = os.path.join((self.config['DEFAULT'].get('test_file_path','/etc/jsnapy/testfiles')).encode('utf-8'), tfile)
+                tfile = os.path.join(self.config.get('DEFAULT', 'test_file_path', vars={'test_file_path':'/etc/jsnapy/testfiles'}).encode('utf-8'), tfile)
             if os.path.isfile(tfile):
                 test_file = open(tfile, 'r')
                 test_files.append(yaml.load(test_file))
@@ -331,8 +332,8 @@ def login(self, output_file):
                 file_tag = k['include']
                 if os.path.isfile(file_tag):
                     lfile = file_tag
-                else: 
-                    lfile = os.path.join((self.config['DEFAULT'].get('test_file_path','/etc/jsnapy/testfiles')).encode('utf-8'), file_tag)
+                else:
+                    lfile = os.path.join((self.config.get('DEFAULT', 'test_file_path', vars={'test_file_path':'/etc/jsnapy/testfiles'})).encode('utf-8'), file_tag)
                 login_file = open(lfile, 'r')
                 dev_file = yaml.load(login_file)
                 gp = k.get('group', 'all')
@@ -404,7 +405,7 @@ def connect(self, hostname, username, password, output_file):
                 dev.close()
         if self.args.check is True or self.args.snapcheck is True or self.args.diff is True:
             if self.main_file.get("mail") and self.args.diff is not True:
-                mfile = os.path.join((self.config['DEFAULT'].get('test_file_path','/etc/jsnapy/testfiles')).encode('utf-8'), self.main_file['mail']) \
+                mfile = os.path.join(self.config.get('DEFAULT', 'test_file_path', vars={'test_file_path':'/etc/jsnapy/testfiles'}).encode('utf-8'), self.main_file['mail']) \
                     if os.path.isfile(self.main_file['mail']) is False else self.main_file['mail']
                 if os.path.isfile(mfile):
                     mail_file = open(mfile, 'r')

lib/jnpr/jsnapy/jsnapy.py

@@ -59,7 +59,7 @@ def generate_snap_file(self, output_file, hostname, name, cmd_format):
             return output_file
         else:
             filename = hostname + '_' + output_file + '_' + name + '.' + cmd_format
-            output_file = os.path.join( (self.config['DEFAULT'].get('snapshot_path', '/etc/jsnapy/snapshots')).encode('utf-8'), filename)
+            output_file = os.path.join((self.config.get('DEFAULT', 'snapshot_path', vars={'snapshot_path':'/etc/jsnapy/snapshots'})).encode('utf-8'), filename)
             return output_file
 
     def store_in_sqlite(self, db, hostname, username, cmd_rpc_name, reply_format, rpc_reply, snap_name):

lib/jnpr/jsnapy/snap.py

@@ -3,14 +3,16 @@
 import os
 import logging
 import colorama
+import configparser
 
 
 class SqliteExtractXml:
 
     def __init__(self, db_name):
         self.logger_sqlite = logging.getLogger(__name__)
-        path = os.getcwd()
-        self.db_filename = os.path.join(path, 'snapshots', db_name)
+        self.config = configparser.ConfigParser()
+        self.config.read(os.path.join('/etc','jsnapy','jsnapy.cfg'))
+        self.db_filename = os.path.join((self.config.get('DEFAULT', 'snapshot_path', vars={'snapshot_path':'/etc/jsnapy/snapshots'})).encode('utf-8') ,db_name)
         if not os.path.isfile(self.db_filename):
             self.logger_sqlite.error(
                 colorama.Fore.RED +