X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_utils.py;h=d6310951699607f9ed0ec694bd3964cb5de7db15;hb=945aaee9d514a2348dce53418f70aeceda8b3ef1;hp=b66ea72adc02ecf160b0dedc5399dbcdd0147fe0;hpb=e9cca3f8a24859b4cfadf65db6ac9a59c9a9755a;p=transportpce.git

diff --git a/tests/transportpce_tests/1.2.1/test_utils.py b/tests/transportpce_tests/1.2.1/test_utils.py
index b66ea72ad..d63109516 100644
--- a/tests/transportpce_tests/1.2.1/test_utils.py
+++ b/tests/transportpce_tests/1.2.1/test_utils.py
@@ -1,78 +1,86 @@
 import os
 import subprocess
 
-honeynode_executable=os.path.join(
-        os.path.dirname(os.path.realpath(__file__)),
-        "..", "..", "honeynode", "1.2.1", "honeynode-distribution", "target", "honeynode-distribution-1.19.04-hc",
-        "honeynode-distribution-1.19.04", "honeycomb-tpce")
-samples_directory=os.path.join(
-        os.path.dirname(os.path.realpath(__file__)),
-        "..", "..", "sample_configs", "openroadm","1.2.1")
+honeynode_executable = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    "..", "..", "honeynode", "1.2.1", "honeynode-simulator", "honeycomb-tpce")
+samples_directory = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    "..", "..", "sample_configs", "openroadm", "1.2.1")
+
+
 def start_xpdra_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode1.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17830", os.path.join(samples_directory,"oper-XPDRA.xml")],
+                [honeynode_executable, "17830", os.path.join(samples_directory, "oper-XPDRA.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_roadma_full_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode2.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17821", os.path.join(samples_directory,"oper-ROADMA-full.xml")],
+                [honeynode_executable, "17821", os.path.join(samples_directory, "oper-ROADMA-full.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_roadma_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode2.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17831", os.path.join(samples_directory,"oper-ROADMA.xml")],
+                [honeynode_executable, "17831", os.path.join(samples_directory, "oper-ROADMA.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_roadmb_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode3.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17832", os.path.join(samples_directory,"oper-ROADMB.xml")],
+                [honeynode_executable, "17832", os.path.join(samples_directory, "oper-ROADMB.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_roadmc_full_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode3.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17823", os.path.join(samples_directory,"oper-ROADMC-full.xml")],
+                [honeynode_executable, "17823", os.path.join(samples_directory, "oper-ROADMC-full.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_roadmc_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode4.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17833", os.path.join(samples_directory,"oper-ROADMC.xml")],
+                [honeynode_executable, "17833", os.path.join(samples_directory, "oper-ROADMC.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_xpdrc_honeynode():
     if os.path.isfile(honeynode_executable):
         with open('honeynode4.log', 'w') as outfile:
             return subprocess.Popen(
-                [honeynode_executable, "17834", os.path.join(samples_directory,"oper-XPDRC.xml")],
+                [honeynode_executable, "17834", os.path.join(samples_directory, "oper-XPDRC.xml")],
                 stdout=outfile, stderr=outfile)
 
+
 def start_tpce():
     if "USE_LIGHTY" in os.environ and os.environ['USE_LIGHTY'] == 'True':
-        print ("starting LIGHTY.IO TransportPCE build...")
+        print("starting LIGHTY.IO TransportPCE build...")
         executable = os.path.join(
-                os.path.dirname(os.path.realpath(__file__)),
-                "..", "..", "..", "lighty", "target", "lighty-transportpce-12.0.0-SNAPSHOT",
-                "clean-start-controller.sh")
+            os.path.dirname(os.path.realpath(__file__)),
+            "..", "..", "..", "lighty", "target", "tpce",
+            "clean-start-controller.sh")
         with open('odl.log', 'w') as outfile:
             return subprocess.Popen(
                 ["sh", executable], stdout=outfile, stderr=outfile,
                 stdin=open(os.devnull))
     else:
-        print ("starting KARAF TransportPCE build...")
+        print("starting KARAF TransportPCE build...")
         executable = os.path.join(
-                os.path.dirname(os.path.realpath(__file__)),
-                "..", "..", "..", "karaf", "target", "assembly", "bin", "karaf")
+            os.path.dirname(os.path.realpath(__file__)),
+            "..", "..", "..", "karaf", "target", "assembly", "bin", "karaf")
         with open('odl.log', 'w') as outfile:
             return subprocess.Popen(
                 ["sh", executable, "server"], stdout=outfile, stderr=outfile,