From adf44f2a5eeb056c5fece0454d3e09d08df160fe Mon Sep 17 00:00:00 2001 From: Andrej Kozemcak Date: Tue, 28 May 2019 10:19:21 +0200 Subject: [TEST] - Initialize to use of YDK in sweetcomb test - remove netopeer client - use YDK - check result, assert when error Change-Id: Icb29dd5a35e8f7dbbeff2e44ec088b890f93b5ef Signed-off-by: Andrej Kozemcak --- test/topology.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'test/topology.py') diff --git a/test/topology.py b/test/topology.py index 617601b..a8a2f15 100644 --- a/test/topology.py +++ b/test/topology.py @@ -1,5 +1,6 @@ # # Copyright (c) 2019 PANTHEON.tech. +# Copyright (c) 2019 Cisco and/or its affiliates. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,12 +17,13 @@ import os import subprocess -from netopeer_controler import Netopeer_controler from vpp_controler import Vpp_controler +from netconf_client import NetConfClient from socket import AF_INET from pyroute2 import IPRoute import psutil import time +from ydk.providers import NetconfServiceProvider class Topology: debug = False @@ -109,11 +111,18 @@ class Topology: self.vpp.spawn() self.process.append(self.vpp) + 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) + def get_vpp(self): return self.vpp def get_netopeer_cli(self): - return self.netopeer_cli + #return self.netopeer_cli + return self.netconf_client def create_topology(self, debug=False): #try: @@ -127,7 +136,8 @@ class Topology: #Wait for netopeer server time.sleep(1) - self._start_netopeer_cli() + #self._start_netopeer_cli() + self._start_netconfclient() #except: #self._kill_process() -- cgit 1.2.3-korg