X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_otn_renderer.py;h=69eee8579fc0cafca609152608df71ec4e7fc0c9;hb=38788ce8eedd77f7b1dc089df00d9e2a9bcfc1f8;hp=27f09cd006740c47ae6f109c9b3e2a45d65b47d7;hpb=e25624aca3a34b7a8e30cd8b8819eb6ca838932d;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index 27f09cd00..69eee8579 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -28,20 +28,14 @@ def extract_a_from_b(a, b): class TransportPCEtesting(unittest.TestCase): - honeynode_process1 = None + sim_process1 = None odl_process = None restconf_baseurl = "http://localhost:8181/restconf" @classmethod def setUpClass(cls): - print("starting honeynode1...") - cls.honeynode_process1 = test_utils.start_spdra_honeynode() - time.sleep(30) - - print("starting opendaylight...") cls.odl_process = test_utils.start_tpce() - time.sleep(60) - print("opendaylight started") + cls.sim_process1 = test_utils.start_sim('spdrav2') @classmethod def tearDownClass(cls): @@ -50,11 +44,11 @@ class TransportPCEtesting(unittest.TestCase): child.wait() cls.odl_process.send_signal(signal.SIGINT) cls.odl_process.wait() - for child in psutil.Process(cls.honeynode_process1.pid).children(): + for child in psutil.Process(cls.sim_process1.pid).children(): child.send_signal(signal.SIGINT) child.wait() - cls.honeynode_process1.send_signal(signal.SIGINT) - cls.honeynode_process1.wait() + cls.sim_process1.send_signal(signal.SIGINT) + cls.sim_process1.wait() def setUp(self): time.sleep(5) @@ -68,7 +62,7 @@ class TransportPCEtesting(unittest.TestCase): "netconf-node-topology:username": "admin", "netconf-node-topology:password": "admin", "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17845", + "netconf-node-topology:port": test_utils.sims['spdrav2']['port'], "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} headers = {'content-type': 'application/json'}