Replaced ixia_nto with ksvisionlib

OpenIxia · Feb 21, 2019 · 6fde355 · 6fde355
1 parent fc73226
commit 6fde355
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -26,9 +26,9 @@ Create virtual environment called `ixvision` in a directory of your choice:
     virtualenv -p python2.7 $PYENV; cd $PYENV; export PYENV_DIR=`pwd`
     source "$PYENV_DIR/bin/activate"
 
-Download VisionNPB library from GitHub (currently, IxVision-ZTA relies on 2018 version of VisionNPB library, which is available via a fork referenced below):
+Download VisionNPB library from GitHub:
 
-    cd "$PYENV_DIR"; git clone https://github.com/bortok/VisionNPB.git
+    cd "$PYENV_DIR"; git clone https://github.com/OpenIxia/VisionNPB.git
 
 Clone IxVision-ZTA repository
 

diff --git a/ixia_nto.py b/ixia_nto.py
diff --git a/ixvision_ztp_filter.py b/ixvision_ztp_filter.py
@@ -21,7 +21,7 @@
 #
 ###############################################################################
 
-from ixia_nto import *
+from ksvisionlib import *
 
 from ixvision_ztp_ntolib import *
 
@@ -73,7 +73,7 @@ def form_dynamic_filter(host_ip, port, username, password, df_name, df_input, df
         print("Non-empty criteria are required for filter mode %s" % (df_mode))
         return
 
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_filter_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_filter_debug.log")
 
     # Search for existing DF, create a new one if not found
     df_list = nto.searchFilters({'name': df_name})
@@ -151,7 +151,7 @@ def update_dynamic_filter(host_ip, port, username, password, df_name, df_criteri
         print("Error: unsupported filter criteria %s" % df_criteria_field)
         return
 
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_filter_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_filter_debug.log")
 
     # Search for the DF
     df_list = nto.searchFilters({'name': df_name})

diff --git a/ixvision_ztp_lldp_tag.py b/ixvision_ztp_lldp_tag.py
@@ -21,7 +21,7 @@
 ###############################################################################
 
 
-from ixia_nto import *
+from ksvisionlib import *
 
 # DEFINE FUNCTIONS HERE
 
@@ -42,7 +42,7 @@
 
 def tag_ports(host_ip, port, username, password, tags):
 
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_lldp_tag_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_lldp_tag_debug.log")
 
     neighbor_list = {}
 

diff --git a/ixvision_ztp_ntolib.py b/ixvision_ztp_ntolib.py
@@ -14,7 +14,7 @@
 #
 ###############################################################################
 
-from ixia_nto import *
+from ksvisionlib import *
 
 # DEFINE VARs HERE
 port_modes_supported = {'net': 'NETWORK', 'tool': 'TOOL'}

diff --git a/ixvision_ztp_port_discovery.py b/ixvision_ztp_port_discovery.py
@@ -17,11 +17,11 @@
 #
 ###############################################################################
 
-from ixia_nto import *
+from ksvisionlib import *
 
 def discover_ports(host_ip, port, username, password, keyword=''):
 
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_debug.log")
 
     discoveredPortList = {}
 

diff --git a/ixvision_ztp_port_group.py b/ixvision_ztp_port_group.py
@@ -20,7 +20,7 @@
 #
 ###############################################################################
 
-from ixia_nto import *
+from ksvisionlib import *
 
 # DEFINE VARs HERE
 pg_modes_supported = {'net': 'INTERCONNECT', 'lb': 'LOAD_BALANCE'}
@@ -41,7 +41,7 @@
 # |_Keywords[Names]
 
 def form_port_groups(host_ip, port, username, password, tags, pg_name, pg_mode_key):
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_port_group_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_port_group_debug.log")
 
     # Check s/w version to use proper API syntax (ixia_nto.py doesn't support API versioning)
     nto_system_properties = nto.getSystem()

diff --git a/ixvision_ztp_port_mode.py b/ixvision_ztp_port_mode.py
@@ -14,7 +14,7 @@
 #
 ###############################################################################
 
-from ixia_nto import *
+from ksvisionlib import *
 
 from ixvision_ztp_ntolib import *
 
@@ -29,7 +29,7 @@
 
 def set_port_mode(host_ip, port, username, password, tags, mode):
 
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_port_mode_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=True, logFile="ixvision_ztp_port_mode_debug.log")
 
     # Search for ports to be updated - can't be a part of a port group, can't have any existing connections
     port_list = nto.searchPorts({'enabled': True, 'port_group_id': None, 'dest_filter_list': [], 'source_filter_list': []})

diff --git a/ixvision_ztp_sysinfo.py b/ixvision_ztp_sysinfo.py
@@ -15,7 +15,7 @@
 ###############################################################################
 
 
-from ixia_nto import *
+from ksvisionlib import *
 
 # DEFINE FUNCTIONS HERE
 
@@ -43,7 +43,7 @@ def nto_get_sysinfo(host_ip, port, username, password):
         'serial_num': 'Serial number:'
     }
 
-    nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=False, logFile="ixvision_status_debug.log")
+    nto = VisionWebApi(host=host_ip, username=username, password=password, port=port, debug=False, logFile="ixvision_status_debug.log")
 
     nto_system_properties = nto.getSystem()
     nto_system_info = nto_system_properties['system_info']

diff --git a/ksvisionlib.py b/ksvisionlib.py
@@ -0,0 +1 @@
+../VisionNPB/RestApi/Python/ksvisionlib.py