merged latest from develop

This commit is contained in:
Blake Harnden 2020-06-13 18:07:21 -07:00
commit 83f66d33f7
16 changed files with 81 additions and 83 deletions

View file

@ -1134,7 +1134,7 @@ class CoreNetworkBase(NodeBase):
bandwidth=netif.getparam("bw"),
dup=netif.getparam("duplicate"),
jitter=netif.getparam("jitter"),
per=netif.getparam("loss"),
loss=netif.getparam("loss"),
)
all_links.append(link_data)
@ -1153,7 +1153,7 @@ class CoreNetworkBase(NodeBase):
bandwidth=netif.getparam("bw"),
dup=netif.getparam("duplicate"),
jitter=netif.getparam("jitter"),
per=netif.getparam("loss"),
loss=netif.getparam("loss"),
)
netif.swapparams("_params_up")