Code Review
/
integration
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix bgp_app_peer test
[integration/test.git]
/
tools
/
fastbgp
/
bgp_app_peer.py
diff --git
a/tools/fastbgp/bgp_app_peer.py
b/tools/fastbgp/bgp_app_peer.py
index 1df7931e0f56c824d3a03c09234d1351401ec3f9..16f658f834a47fdd496cbfb5f5b2974704ff4859 100755
(executable)
--- a/
tools/fastbgp/bgp_app_peer.py
+++ b/
tools/fastbgp/bgp_app_peer.py
@@
-12,6
+12,7
@@
import argparse
import logging
import time
import xml.dom.minidom as md
import logging
import time
import xml.dom.minidom as md
+import os.path
__author__ = "Radovan Sajben"
__author__ = "Radovan Sajben"
@@
-59,8
+60,12
@@
def _stream_data(xml_template, prefix_base, prefix_len, count, route_key=False,
:yield xml_data: requested data by elements as xml data
"""
global total_build_data_time_counter
:yield xml_data: requested data by elements as xml data
"""
global total_build_data_time_counter
-
- routes = md.parse(xml_template)
+ if os.path.isfile(xml_template + "." + stream):
+ routes = md.parse(xml_template + "." + stream)
+ elif os.path.isfile(xml_template):
+ routes = md.parse(xml_template)
+ else:
+ logger.error("Template '{}' does not exist.".format(xml_template))
routes_node = routes.getElementsByTagName("ipv4-routes")[0]
route_node = routes.getElementsByTagName("ipv4-route")[0]
routes_node = routes.getElementsByTagName("ipv4-routes")[0]
route_node = routes.getElementsByTagName("ipv4-route")[0]
@@
-403,7
+408,7
@@
if __name__ == "__main__":
const=logging.DEBUG, default=logging.INFO,
help="Set log level to debug (default is info)")
parser.add_argument("--logfile", default="bgp_app_peer.log", help="Log file name")
const=logging.DEBUG, default=logging.INFO,
help="Set log level to debug (default is info)")
parser.add_argument("--logfile", default="bgp_app_peer.log", help="Log file name")
- parser.add_argument("--stream", default="", help="Stream - oxygen, fluorine ...")
+ parser.add_argument("--stream", default="", help="
ODL
Stream - oxygen, fluorine ...")
args = parser.parse_args()
args = parser.parse_args()
@@
-425,12
+430,13
@@
if __name__ == "__main__":
prefix_base = args.prefix
prefix_len = args.prefixlen
count = args.count
prefix_base = args.prefix
prefix_len = args.prefixlen
count = args.count
- auth = (args.user, args.password)
uri = args.uri
uri = args.uri
+ stream = args.stream
+ xml_template = args.xml
+
# From Fluorine onward route-key argument is mandatory for identification.
# From Fluorine onward route-key argument is mandatory for identification.
- route_key_stream = ["fluorine"]
- [xml_template, route_key] = ["{}.{}".format(args.xml, args.stream), True] \
- if args.stream in route_key_stream else [args.xml, False]
+ route_key_stream = ["oxygen"]
+ route_key = True if args.stream not in route_key_stream else False
test_start_time = time.time()
total_build_data_time_counter = 0
test_start_time = time.time()
total_build_data_time_counter = 0