updates

Author: kirankotari

.version

@@ -1 +1 @@
-4.0.0
+4.0.0

netsim_wrapper/main.py

@@ -1,6 +1,7 @@
 import sys
 from logging import DEBUG
-from nwrap import NWrap
+
+from netsim_wrapper.nwrap import NWrap
 
 
 def check_verbose(params):

netsim_wrapper/netsim.py

@@ -1,8 +1,9 @@
 import re
-from logging import DEBUG
-from utils import Utils, Singleton
 from collections import OrderedDict
 
+from netsim_wrapper.utils import Utils, Singleton
+
+
 
 class Netsim(metaclass=Singleton):
     name = __name__

netsim_wrapper/nso.py

@@ -1,12 +1,15 @@
-from utils import Singleton, Download
 from collections import defaultdict
 
+from netsim_wrapper.utils import Singleton, Download
+
+
 
 class AuthGroup(metaclass=Singleton):
     name = __name__
 
-    def local(self):
-        return """
+    def add(self, type):
+        def local():
+            return """
 <devices xmlns="http://tail-f.com/ns/ncs">
     <authgroups>
         <group>
@@ -20,8 +23,8 @@ def local(self):
 </devices>
 """
 
-    def system(self):
-        return """
+        def system():
+            return """
 <devices xmlns="http://tail-f.com/ns/ncs">
     <authgroups>
         <group>
@@ -45,13 +48,15 @@ def system(self):
     </authgroups>
 </devices>
 """
-
+        if type == 'system':
+            return system()
+        return local()
 
 class AAA(metaclass=Singleton):
     name = __name__
 
     def add(self, type):
-        def admin(self):
+        def admin():
             return """
 <config xmlns="http://tail-f.com/ns/config/1.0">
   <aaa xmlns="http://tail-f.com/ns/aaa/1.1">
@@ -79,7 +84,7 @@ def admin(self):
 </config>
 """
 
-        def default(self):
+        def default():
             return """
 <config xmlns="http://tail-f.com/ns/config/1.0">
   <aaa xmlns="http://tail-f.com/ns/aaa/1.1">
@@ -176,10 +181,7 @@ def compile_neds(self):
 
     def load_authgroup(self, type, path=None): # type -> local/system/custom
         path = path or '/tmp/authgroup.xml'
-        if type == 'local':
-            self.utils.xml.dump(self.auth.local, path)
-        if type == 'system':
-            self.utils.xml.dump(self.auth.system, path)
+        self.utils.xml.dump(self.auth.add(type), path)
         return path
 
     def load_aaa(self, type): # type -> add.admin/add.default
@@ -208,20 +210,24 @@ def download_neds(self):
             self.default['neds']
         )
 
-    def extract_neds(self, extract_tar=True):
+    def extract_neds(self, signed_bin=True, extract_tar=True):
         self.log.debug("extracting neds")
         # TODO: need to test
-        cmd = ['cd', self.default['ppath'], '&&']
+        files = []
         for ned in self.default['neds']:
             file = ned.split('/')[-1]
             self.log.debug('ned: {}'.format(file))
             self.utils.cmd.run(['mv', file, self.default['ppath']])
-            self.utils.cmd.run(cmd + ['bash', file])
-            if not extract_tar:
-                continue
-            tar_file = self.utils.get_tar(file)
-            self.utils.cmd.run(cmd + ['tar', '-xvf', tar_file])
-            self.utils.cmd.run(cmd + ['rm', '-rf', tar_file, file])
+            files.append(file)
+
+        self.utils.change_dir(self.default['ppath'])
+        for ned in files:
+            if signed_bin:
+                self.utils.cmd.run(['bash', ned])
+            if extract_tar:
+                tar_file = self.utils.get_tar(ned)
+                self.utils.cmd.run(['tar', '-xvf', tar_file])
+                self.utils.cmd.run(['rm', '-rf', tar_file, ned])
         self.log.debug('extraction done')
 
     def create_devices(self):
@@ -277,8 +283,10 @@ def analyse_params(self):
 
         self.log.debug("analysing template done")
 
-    def apply(self):
+    def apply(self, username, password):
         self.analyse_params()
+        self.default['username'] = username
+        self.default['password'] = password
 
         self.log.debug("per-netsim steps")
         if self.default['download-neds']:
@@ -307,7 +315,7 @@ def pre_create():
             self.nwrap.netsim.start()
 
         if self.default['add-to-nso']:
-            path = 'tmp/devices.xml'
+            path = '/tmp/devices.xml'
             data = self.nwrap.netsim.ncs_xml_init(sysout=False)
             self.utils.xml.dump(data, path)
 

netsim_wrapper/nwrap.py

@@ -1,9 +1,10 @@
-from utils import Singleton, Download
-from netsim import Netsim, NetsimTemplates, NetsimInfo, NetsimDelete
-
-from nso import NsoUtils
 from collections import defaultdict
 
+from netsim_wrapper.utils import Singleton, Download
+from netsim_wrapper.netsim import Netsim, NetsimTemplates
+from netsim_wrapper.netsim import NetsimInfo, NetsimDelete
+from netsim_wrapper.nso import NsoUtils
+
 
 help = """
 Usage nwrap template create [network | device] [yaml | json] [<fileName>]
@@ -235,6 +236,9 @@ def analyse_params(self, params):
     def apply(self, params):
         params = self.analyse_params(params)
 
+        # for k,v in params.items():
+        #     print("{}: {}".format(k, v))
+
         if params['help']:
             self.help
         if params['version']:
@@ -274,7 +278,7 @@ def apply(self, params):
         # feature template load and apply
         if params['load']:
             self.nwrap.template.load(params['filename'])
-            self.nso.apply()
+            self.nso.apply(params['username'], params['password'])
 
         # feature directly calling ncs-netsim commands
         if params['pass']:
@@ -307,6 +311,3 @@ def apply(self, params):
             self.nwrap.add_device(params['package'], params['device'])
             self.utils.exit
 
-        # for k,v in params.items():
-        #     print("{}: {}".format(k, v))
-

netsim_wrapper/utils.py

@@ -5,7 +5,7 @@
 import logging
 import subprocess
 
-from os import path, remove
+from os import path, remove, chdir
 from collections import OrderedDict
 from itertools import chain, takewhile
 
@@ -167,6 +167,8 @@ def decode(self, args):
 
     def join(self, cmd, sensitive):
         # print(cmd)
+        if type(cmd) == str:
+            return cmd
         cmd_str = ' '.join(cmd)
         if sensitive:
             cmd_str = re.sub(r":\S+", ':xxxxxx', cmd_str)
@@ -234,6 +236,9 @@ def iloc(self, lst, e): # get_index
         except ValueError:
             return None
 
+    def change_dir(self, path):
+        chdir(path)
+
     def flatset(slef, s):
         return set(chain(*s))
 
@@ -269,6 +274,8 @@ def filter_alive(self, data):
         return devices
 
     def append_log(self, out:str, method='info'):
+        if not out:
+            return
         for line in out.split('\n'):
             if line: getattr(self.log, method)(line)
         if self.log.level == logging.DEBUG:
@@ -290,7 +297,7 @@ def setup(self, username, password):
         self.cmd += ['-u', "{}:{}".format(username, password)]
 
     def download(self, link):
-        self.log.debug('download: {}'.format(link))
+        self.log.info('download: {}'.format(link))
         fname = link.split('/')[-1] or 'dummyFile'
         out = self.utils.cmd.run(self.cmd + [link, '-o', fname], sensitive=True)
         self.utils.append_log(out)