Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
make Honeynode and tox scripts BSD compatible
[transportpce.git]
/
tests
/
transportpce_tests
/
1.2.1
/
test_utils.py
diff --git
a/tests/transportpce_tests/1.2.1/test_utils.py
b/tests/transportpce_tests/1.2.1/test_utils.py
index 37b0bc54e61457c917d8d11c374bf035d14973c2..5d9aacf59bdb3c53196ba0e151b427bb3b73c12d 100644
(file)
--- a/
tests/transportpce_tests/1.2.1/test_utils.py
+++ b/
tests/transportpce_tests/1.2.1/test_utils.py
@@
-2,67
+2,67
@@
import os
import subprocess
def start_xpdra_honeynode():
import subprocess
def start_xpdra_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode1.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode1.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17830", "sample_configs/openroadm/2.1/oper-XPDRA.xml"],
- stdout=outfile)
+ [executable, "17830", "sample_configs/openroadm/
1.
2.1/oper-XPDRA.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_roadma_full_honeynode():
def start_roadma_full_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode2.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode2.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17821", "sample_configs/openroadm/2.1/oper-ROADMA-full.xml"],
- stdout=outfile)
+ [executable, "17821", "sample_configs/openroadm/
1.
2.1/oper-ROADMA-full.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_roadma_honeynode():
def start_roadma_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode2.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode2.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17831", "sample_configs/openroadm/2.1/oper-ROADMA.xml"],
- stdout=outfile)
+ [executable, "17831", "sample_configs/openroadm/
1.
2.1/oper-ROADMA.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_roadmb_honeynode():
def start_roadmb_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode3.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode3.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17832", "sample_configs/openroadm/2.1/oper-ROADMB.xml"],
- stdout=outfile)
+ [executable, "17832", "sample_configs/openroadm/
1.
2.1/oper-ROADMB.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_roadmc_full_honeynode():
def start_roadmc_full_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode3.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode3.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17823", "sample_configs/openroadm/2.1/oper-ROADMC-full.xml"],
- stdout=outfile)
+ [executable, "17823", "sample_configs/openroadm/
1.
2.1/oper-ROADMC-full.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_roadmc_honeynode():
def start_roadmc_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode4.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode4.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17833", "sample_configs/openroadm/2.1/oper-ROADMC.xml"],
- stdout=outfile)
+ [executable, "17833", "sample_configs/openroadm/
1.
2.1/oper-ROADMC.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_xpdrc_honeynode():
def start_xpdrc_honeynode():
- executable = ("./honeynode/
2.1/honeynode-distribution/target/honeynode-distribution-1.18.01
-hc"
- "/honeynode-distribution-1.1
8.01
/honeycomb-tpce")
+ executable = ("./honeynode/
1.2.1/honeynode-distribution/target/honeynode-distribution-1.19.04
-hc"
+ "/honeynode-distribution-1.1
9.04
/honeycomb-tpce")
if os.path.isfile(executable):
with open('honeynode4.log', 'w') as outfile:
return subprocess.Popen(
if os.path.isfile(executable):
with open('honeynode4.log', 'w') as outfile:
return subprocess.Popen(
- [executable, "17834", "sample_configs/openroadm/2.1/oper-XPDRC.xml"],
- stdout=outfile)
+ [executable, "17834", "sample_configs/openroadm/
1.
2.1/oper-XPDRC.xml"],
+ stdout=outfile
, stderr=outfile
)
def start_tpce():
if "USE_LIGHTY" in os.environ and os.environ['USE_LIGHTY'] == 'True':
def start_tpce():
if "USE_LIGHTY" in os.environ and os.environ['USE_LIGHTY'] == 'True':
@@
-70,12
+70,12
@@
def start_tpce():
executable = "../lighty/target/lighty-transportpce-12.0.0-SNAPSHOT/clean-start-controller.sh"
with open('odl.log', 'w') as outfile:
return subprocess.Popen(
executable = "../lighty/target/lighty-transportpce-12.0.0-SNAPSHOT/clean-start-controller.sh"
with open('odl.log', 'w') as outfile:
return subprocess.Popen(
- ["
bash", executable], stdout
=outfile,
+ ["
sh", executable], stdout=outfile, stderr
=outfile,
stdin=open(os.devnull))
else:
print ("starting KARAF TransportPCE build...")
executable = "../karaf/target/assembly/bin/karaf"
with open('odl.log', 'w') as outfile:
return subprocess.Popen(
stdin=open(os.devnull))
else:
print ("starting KARAF TransportPCE build...")
executable = "../karaf/target/assembly/bin/karaf"
with open('odl.log', 'w') as outfile:
return subprocess.Popen(
- ["
bash", executable, "server"], stdout
=outfile,
+ ["
sh", executable, "server"], stdout=outfile, stderr
=outfile,
stdin=open(os.devnull))
stdin=open(os.devnull))