Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
HC Test: increase timeout value for ODL setup
[csit.git]
/
resources
/
libraries
/
python
/
NAT.py
diff --git
a/resources/libraries/python/NAT.py
b/resources/libraries/python/NAT.py
index
d0e01c7
..
485cd53
100644
(file)
--- a/
resources/libraries/python/NAT.py
+++ b/
resources/libraries/python/NAT.py
@@
-43,28
+43,33
@@
class NATUtil(object):
data = []
# lines[0,1] are table and column headers
for line in lines[2::]:
data = []
# lines[0,1] are table and column headers
for line in lines[2::]:
+ # Ignore extra data after NAT table
+ if "snat_static_mapping_dump error: Misc" in line or "vat#" in line:
+ continue
items = line.split(" ")
while "" in items:
items.remove("")
if len(items) == 0:
continue
items = line.split(" ")
while "" in items:
items.remove("")
if len(items) == 0:
continue
- elif len(items) ==
3
:
+ elif len(items) ==
4
:
# no ports were returned
data.append({
"local_address": items[0],
"remote_address": items[1],
# no ports were returned
data.append({
"local_address": items[0],
"remote_address": items[1],
- "vrf": items[2]
+ "vrf": items[2],
+ "protocol": items[3]
})
})
- elif len(items) ==
5
:
+ elif len(items) ==
6
:
data.append({
"local_address": items[0],
"local_port": items[1],
"remote_address": items[2],
"remote_port": items[3],
data.append({
"local_address": items[0],
"local_port": items[1],
"remote_address": items[2],
"remote_port": items[3],
- "vrf": items[4]
+ "vrf": items[4],
+ "protocol": items[5]
})
else:
})
else:
- raise RuntimeError("Unexpected output from s
pan
_mapping_dump.")
+ raise RuntimeError("Unexpected output from s
nat
_mapping_dump.")
return data
return data
@@
-90,8
+95,9
@@
class NATUtil(object):
data = []
for line in lines:
items = line.split(" ")
data = []
for line in lines:
items = line.split(" ")
- while "" in items:
- items.remove("")
+ for trash in ("", "vat#"):
+ while trash in items:
+ items.remove(trash)
if len(items) == 0:
continue
elif len(items) == 3:
if len(items) == 0:
continue
elif len(items) == 3:
@@
-102,6
+108,6
@@
class NATUtil(object):
})
else:
raise RuntimeError(
})
else:
raise RuntimeError(
- "Unexpected output from s
pan
_interface_dump.")
+ "Unexpected output from s
nat
_interface_dump.")
return data
return data