summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndrej Kozemcak <andrej.kozemcak@pantheon.tech>2019-06-03 14:44:09 +0200
committerHongjun Ni <hongjun.ni@intel.com>2019-06-13 02:33:12 +0000
commit86af475f838adff5c44bb8eccdfba2d665975451 (patch)
tree294b7ecf1939755502ca6e9179b10f764b9a440c /test
parent866d47a41d198680426c095362d97ed218e4f94f (diff)
[TEST] - Jenkins dependence
- Update libssl for ubuntu 16.04 - Change ssh password for netopeer - Handle exception Change-Id: Ic13d96491a67496cba2b6ef698698b855ee67fd1 Signed-off-by: Andrej Kozemcak <andrej.kozemcak@pantheon.tech>
Diffstat (limited to 'test')
-rwxr-xr-xtest/run_test.py2
-rw-r--r--test/topology.py18
2 files changed, 13 insertions, 7 deletions
diff --git a/test/run_test.py b/test/run_test.py
index b7898fb..870e6c5 100755
--- a/test/run_test.py
+++ b/test/run_test.py
@@ -83,8 +83,6 @@ if __name__ == '__main__':
"(may be specified multiple times)")
args = parser.parse_args()
- util.import_yang_modules()
-
ddir = list()
if args.dir is None:
ddir.append(os.getcwd())
diff --git a/test/topology.py b/test/topology.py
index d8fab1c..33ac58e 100644
--- a/test/topology.py
+++ b/test/topology.py
@@ -24,6 +24,7 @@ from pyroute2 import IPRoute
import psutil
import time
from ydk.providers import NetconfServiceProvider
+from ydk.errors import YClientError
class Topology:
@@ -42,6 +43,9 @@ class Topology:
return
for process in self.process:
+ if process is None:
+ continue
+
process.terminate()
for proc in psutil.process_iter(attrs=['pid', 'name']):
@@ -98,8 +102,9 @@ class Topology:
def _start_netopeer_server(self):
#TODO: Add to log
#print("Start netopeer server.")
- self.netopeer_server = subprocess.Popen("netopeer2-server",
- stdout=subprocess.PIPE)
+ err = open("/var/log/netopeer2-server", 'wb')
+ self.netopeer_server = subprocess.Popen(["netopeer2-server", "-d"],
+ stdout=subprocess.PIPE, stderr=err)
self.process.append(self.netopeer_server)
def _start_netopeer_cli(self):
@@ -117,9 +122,12 @@ class Topology:
def _start_netconfclient(self):
#print("Start NetconfClient")
- self.netconf_client = NetConfClient(address="127.0.0.1",
- username="root", password="0000")
- self.process.append(self.netconf_client)
+ try:
+ self.netconf_client = NetConfClient(address="127.0.0.1",
+ username="user", password="user")
+ self.process.append(self.netconf_client)
+ except RuntimeError as err:
+ print("NetConfClient failed, {}".format(err))
def get_vpp(self):
return self.vpp