Merge changes from topics 'YARDSTICK-1351', 'YARDSTICK-1339'
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Tue, 24 Jul 2018 11:00:12 +0000 (11:00 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 24 Jul 2018 11:00:12 +0000 (11:00 +0000)
commitd85cefdffe8b3ccb9b919f1cb83be42152e9e802
tree868025a4a02e7f92b3112cc6b8df056d8bfb9c98
parent05dcc38c95cf0f35adadc1545fe663bfbb457bef
parentabd5b952f42f429f6f1b59f3f7822cc92da0f6f6
Merge changes from topics 'YARDSTICK-1351', 'YARDSTICK-1339'

* changes:
  Add IP mask to IxNetwork configuration
  Improve NetworkServiceTestCase._get_ip_flow_range() function